Changeset abb12f in git for Singular

Timestamp:

Nov 8, 2013, 5:40:43 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

70b3ae0102981cd252f90101eaae430e561b8335

Parents:

1b67251e4a873733c02ccc815041eedc24741797bf60110df1fa419b30f99931324a3f93e540bb71

Message:

Merge pull request #419 from steenpass/rlimit_sw

raise RLIMIT_NPROC if necessary for fork()

Location:

Singular

Files:

• Makefile.am (modified) (1 diff)
• checklibs.c (modified) (2 diffs)
• links/ssiLink.cc (modified) (2 diffs)
• rlimit.c (added)
• rlimit.h (added)

Singular/Makefile.am

@@ -138 +138 @@
    walk_ip.cc\
    wrapper.cc\
-   fereadl.c mmstd.c claptmpl.cc
+   fereadl.c mmstd.c claptmpl.cc\
+   rlimit.c
 
 #   links/slInit_Dynamic.cc

Singular/checklibs.c

@@ -294 +294 @@
         pp=p+8;
         while((*pp)==' ') pp++;
-        if (((*pp)!='"') || (strstr(pp,"$Id")==NULL))
-          printf("error: version string should start with $""Id");
+        /* syntax of version string: "version <filename> <version> <date> "
+        if (*pp)!='"')
+          printf("error: version string should ....");
+        */
       }
     }
@@ -414 +416 @@
   /* part 3: summary*/
   printf("\nproc part parsed: %d lines of %s\n",footer,argv[1]);
-  if (have_version!=1) printf("version missing/dupplicate (%d)\n",have_version);
-  if (have_category!=1) printf("category missing/dupplicate (%d)\n",have_category);
-  if (have_info!=1) printf("info missing/dupplicate (%d)\n",have_info);
+  if (have_version!=1) printf("version missing/duplicate (%d)\n",have_version);
+  if (have_category!=1) printf("category missing/duplicate (%d)\n",have_category);
+  if (have_info!=1) printf("info missing/duplicate (%d)\n",have_info);
 
   printf("\nGENERAL SUMMARY:\n");

Singular/links/ssiLink.cc

@@ -38 +38 @@
 #include <libpolys/misc/options.h>
 #include <kernel/timer.h>
+#include <Singular/rlimit.h>
 #include <Singular/subexpr.h>
 #include <Singular/links/silink.h>
@@ -779 +780 @@
         pipe(pc);
         pipe(cp);
-        pid_t pid=fork();
+        pid_t pid = fork();
+        if (pid == -1 && errno == EAGAIN)   // RLIMIT_NPROC too low?
+        {
+          raise_rlimit_nproc();
+          pid = fork();
+        }
+        if (pid == -1)
+        {
+          WerrorS("could not fork");
+        }
         if (pid==0) /*fork: child*/
         {