Changeset ea8692 in git for Singular

Timestamp:

May 18, 2015, 5:29:22 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

b7b51e5dd11e262b4887f510543fc5600bc0c00b

Parents:

01b7f7a9030616e6d505c575db91b858569380a3

Message:

ssi close handling

File:

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

Singular/links/ssiLink.cc

@@ -1139 +1139 @@
         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; }
       }
       if (d->r!=NULL) rKill(d->r);
@@ -1150 +1152 @@
         struct timespec rem;
         int r;
-        do
+        loop
         {
           r = nanosleep(&t, &rem);
           t = rem;
-        } while ((r < 0) && (errno == EINTR)
-            && (si_waitpid(d->pid,NULL,WNOHANG) == 0));
-        if ((r == 0) && (kill(d->pid,0) == 0))
+          // child finished:
+          if (si_waitpid(d->pid,NULL,WNOHANG) != 0) break;
+          // other signal, waited s>= 100 ms:
+          if ((r==0) || (errno != EINTR)) break;
+        }
+        if (kill(d->pid,0) == 0)
         {
           kill(d->pid,15);
           t.tv_sec=5; // <=5s
           t.tv_nsec=0;
-          do
+          loop
           {
             r = nanosleep(&t, &rem);
             t = rem;
-          } while ((r < 0) && (errno == EINTR)
-              && (si_waitpid(d->pid,NULL,WNOHANG) == 0));
-          if ((r == 0) && (kill(d->pid,0) == 0))
+            // child finished:
+            if (si_waitpid(d->pid,NULL,WNOHANG) != 0) break;
+            // other signal, waited s>= 100 ms:
+            if ((r==0) || (errno != EINTR)) break;
+          }
+          if (kill(d->pid,0) == 0)
           {
             kill(d->pid,9); // just to be sure
@@ -1174 +1182 @@
         }
       }
-      if (d->f_read!=NULL) s_close(d->f_read);
-      if (d->f_read!=NULL) s_free(d->f_read);
-      if (d->f_write!=NULL) fclose(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; }
       if ((strcmp(l->mode,"tcp")==0)
       || (strcmp(l->mode,"fork")==0))