Changeset f3b9c82 in git

Timestamp:

Nov 27, 2013, 2:45:54 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

d3063fda87edfbb83154427f69508683dd741123

Parents:

c6d3fc466dfd65a90389184c556ed357ac5c5d6fd9c46b7a02e3941c5c90ca24da6b4b0e465c6569

Message:

Merge pull request #431 from steenpass/nanosleep_sw

chg: restart nanosleep when interrupted by signal

Location:

Singular

Files:

• LIB/primdec.lib (modified) (1 diff)
• links/ssiLink.cc (modified) (1 diff)

Singular/LIB/primdec.lib

@@ -40 +40 @@
  zerodec(I);       zerodimensional decomposition via Monico
  absPrimdecGTZ(I); the absolute prime components of I
+ sep(f,k);         the separabel part of f as polynomial in Fp(t1,...,tm)
 ";
 

Singular/links/ssiLink.cc

@@ -1140 +1140 @@
         t.tv_sec=0;
         t.tv_nsec=100000000; // <=100 ms
-        int r=si_nanosleep(&t,NULL);
-        if((r==0) && (si_waitpid(d->pid,NULL,WNOHANG)==0))
+        struct timespec rem;
+        int r;
+        int wait;
+        do
+        {
+          r = nanosleep(&t, &rem);
+          t = rem;
+        } while ((r < 0) && (errno == EINTR)
+            && ((wait = si_waitpid(d->pid,NULL,WNOHANG)) == 0));
+        if ((r == 0) && (wait == 0))
         {
           kill(d->pid,15);
           t.tv_sec=5; // <=5s
           t.tv_nsec=0;
-          r=si_nanosleep(&t,NULL);
-          if((r==0)&&(si_waitpid(d->pid,NULL,WNOHANG)==0))
+          do
+          {
+            r = nanosleep(&t, &rem);
+            t = rem;
+          } while ((r < 0) && (errno == EINTR)
+              && ((wait = si_waitpid(d->pid,NULL,WNOHANG)) == 0));
+          if ((r == 0) && (wait == 0))
           {
             kill(d->pid,9); // just to be sure