Changeset 3857cb in git

Timestamp:

May 18, 2011, 1:01:48 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

aab0bf3d4a3784735075a5752e502e6079f5a741

Parents:

3ce6179e64007d5422ec76066d381fcaf21651f9

Message:

waitpid fix for ssi

git-svn-id: file:///usr/local/Singular/svn/trunk@14224 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ssiLink.cc (modified) (2 diffs)

Singular/ssiLink.cc

@@ -984 +984 @@
   if (d!=NULL)
   {
+    if (d->r!=NULL) rKill(d->r);
     if ((strcmp(l->mode,"tcp")==0)
     || (strcmp(l->mode,"fork")==0))
     {
-      if (d->send_quit_at_exit)
-      {
-        fprintf(d->f_write,"99\n");fflush(d->f_write);
-      }
       link_list hh=ssiToBeClosed;
       if (hh!=NULL)
@@ -1011 +1008 @@
         }
       }
+      if (d->send_quit_at_exit)
+      {
+        fprintf(d->f_write,"99\n");fflush(d->f_write);
+      }
     }
     if (d->f_read!=NULL) fclose(d->f_read);
     if (d->f_write!=NULL) fclose(d->f_write);
-    if (d->r!=NULL) rKill(d->r);
     if (d->pid!=0)
     {
       int status;
-      kill(d->pid,15);
-      waitpid(d->pid,&status,WNOHANG);
+      if (kill(d->pid,15)!=0)
+      {
+         waitpid(d->pid,&status,WNOHANG);
+      }
     }
     omFreeSize((ADDRESS)d,(sizeof *d));