Changeset d9c46b in git for Singular

Timestamp:

Nov 27, 2013, 1:53:56 PM (10 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f3b9c8218927971b73c98bdad2d70edd385dbc67

Parents:

aee346d01140a3cd0f7a969421b69db5fece8efd

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-27 13:53:56+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-27 14:25:09+01:00

Message:

chg: restart nanosleep when interrupted by signal
(cherry picked from commit f9efe23dee0924e650e1aefea029b4add8fcc7e9)

Signed-off-by: Andreas Steenpass <steenpass@mathematik.uni-kl.de>

File:

• Singular/links/ssiLink.cc (modified) (1 diff)

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