Changeset cfe30a in git for Singular

Timestamp:

Nov 28, 2013, 9:09:44 AM (10 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

c42a9f75e7b92be96e4b082346d946500227e213

Parents:

a529d3d05ff37e5533db2031b45d5fe7c6cad6a8

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-28 09:09:44+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-28 09:12:55+01:00

Message:

chg: do another waitpid() after nanosleep() succeeded
(cherry picked from commit 9d9a7faa6bb7522c1db8caabc4c47c0aa0840caf)

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

File:

• Singular/links/ssiLink.cc (modified) (3 diffs)

Singular/links/ssiLink.cc

@@ -1142 +1142 @@
         struct timespec rem;
         int r;
-        int wait=0;
         do
         {
@@ -1148 +1147 @@
           t = rem;
         } while ((r < 0) && (errno == EINTR)
-            && ((wait = si_waitpid(d->pid,NULL,WNOHANG)) == 0));
-        if ((r == 0) && (wait == 0))
+            && (si_waitpid(d->pid,NULL,WNOHANG) == 0));
+        if ((r == 0) && (si_waitpid(d->pid,NULL,WNOHANG) == 0))
         {
           kill(d->pid,15);
@@ -1159 +1158 @@
             t = rem;
           } while ((r < 0) && (errno == EINTR)
-              && ((wait = si_waitpid(d->pid,NULL,WNOHANG)) == 0));
-          if ((r == 0) && (wait == 0))
+              && (si_waitpid(d->pid,NULL,WNOHANG) == 0));
+          if ((r == 0) && (si_waitpid(d->pid,NULL,WNOHANG) == 0))
           {
             kill(d->pid,9); // just to be sure