Changeset abb12f in git


Ignore:
Timestamp:
Nov 8, 2013, 5:40:43 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')
Children:
70b3ae0102981cd252f90101eaae430e561b8335
Parents:
1b67251e4a873733c02ccc815041eedc24741797bf60110df1fa419b30f99931324a3f93e540bb71
Message:
Merge pull request #419 from steenpass/rlimit_sw

raise RLIMIT_NPROC if necessary for fork()
Location:
Singular
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.am

    r1b6725 rabb12f  
    138138   walk_ip.cc\
    139139   wrapper.cc\
    140    fereadl.c mmstd.c claptmpl.cc
     140   fereadl.c mmstd.c claptmpl.cc\
     141   rlimit.c
    141142
    142143#   links/slInit_Dynamic.cc
  • Singular/checklibs.c

    rbf60110 rabb12f  
    294294        pp=p+8;
    295295        while((*pp)==' ') pp++;
    296         if (((*pp)!='"') || (strstr(pp,"$Id")==NULL))
    297           printf("error: version string should start with $""Id");
     296        /* syntax of version string: "version <filename> <version> <date> "
     297        if (*pp)!='"')
     298          printf("error: version string should ....");
     299        */
    298300      }
    299301    }
     
    414416  /* part 3: summary*/
    415417  printf("\nproc part parsed: %d lines of %s\n",footer,argv[1]);
    416   if (have_version!=1) printf("version missing/dupplicate (%d)\n",have_version);
    417   if (have_category!=1) printf("category missing/dupplicate (%d)\n",have_category);
    418   if (have_info!=1) printf("info missing/dupplicate (%d)\n",have_info);
     418  if (have_version!=1) printf("version missing/duplicate (%d)\n",have_version);
     419  if (have_category!=1) printf("category missing/duplicate (%d)\n",have_category);
     420  if (have_info!=1) printf("info missing/duplicate (%d)\n",have_info);
    419421
    420422  printf("\nGENERAL SUMMARY:\n");
  • Singular/links/ssiLink.cc

    r1b6725 rabb12f  
    3838#include <libpolys/misc/options.h>
    3939#include <kernel/timer.h>
     40#include <Singular/rlimit.h>
    4041#include <Singular/subexpr.h>
    4142#include <Singular/links/silink.h>
     
    779780        pipe(pc);
    780781        pipe(cp);
    781         pid_t pid=fork();
     782        pid_t pid = fork();
     783        if (pid == -1 && errno == EAGAIN)   // RLIMIT_NPROC too low?
     784        {
     785          raise_rlimit_nproc();
     786          pid = fork();
     787        }
     788        if (pid == -1)
     789        {
     790          WerrorS("could not fork");
     791        }
    782792        if (pid==0) /*fork: child*/
    783793        {
Note: See TracChangeset for help on using the changeset viewer.