Changeset 9db944 in git for Singular/links/ssiLink.cc

Timestamp:

Apr 12, 2016, 2:26:05 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

1a1f82bc8f8fca00c6831cafb921250413a6c7d2

Parents:

9ef321bcdf1ec45cb2df3f22b14b2a6c67306895

Message:

fix: slClose/slPrepColse re-considered

File:

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

Singular/links/ssiLink.cc

@@ -1121 +1121 @@
   if (l!=NULL)
   {
+    SI_LINK_SET_CLOSE_P(l);
     ssiInfo *d = (ssiInfo *)l->data;
     if (d!=NULL)
@@ -1143 +1144 @@
     if (d!=NULL)
     {
+      // send quit signal
       if ((d->send_quit_at_exit)
       && (d->quit_sent==0))
@@ -1148 +1150 @@
         fputs("99\n",d->f_write);
         fflush(d->f_write);
-        if (d->f_read!=NULL) { s_close(d->f_read);s_free(d->f_read);}
-        if (d->f_write!=NULL) { fclose(d->f_write); d->f_write=NULL; }
       }
+      // clean ring
       if (d->r!=NULL) rKill(d->r);
+      // did the child to stop ?
       si_waitpid(d->pid,NULL,WNOHANG);
       if ((d->pid!=0)
@@ -1163 +1165 @@
         loop
         {
+          // wait till signal or time rem:
           r = nanosleep(&t, &rem);
           t = rem;
@@ -1170 +1173 @@
           if ((r==0) || (errno != EINTR)) break;
         }
-        if (kill(d->pid,0) == 0)
+        if (kill(d->pid,0) == 0) // pid still exists
         {
           kill(d->pid,15);
@@ -1177 +1180 @@
           loop
           {
+            // wait till signal or time rem:
             r = nanosleep(&t, &rem);
             t = rem;
             // child finished:
             if (si_waitpid(d->pid,NULL,WNOHANG) != 0) break;
-            // other signal, waited s>= 100 ms:
+            // other signal, waited s>=  5 s:
             if ((r==0) || (errno != EINTR)) break;
           }
@@ -1191 +1195 @@
         }
       }
-      if (d->f_read!=NULL) { s_close(d->f_read);s_free(d->f_read);}
+      if (d->f_read!=NULL) { s_close(d->f_read);s_free(d->f_read);d->f_read=NULL;}
       if (d->f_write!=NULL) { fclose(d->f_write); d->f_write=NULL; }
       if ((strcmp(l->mode,"tcp")==0)