Changeset 5c7641 in git for Singular/ssiLink.cc

Timestamp:

Sep 23, 2010, 11:48:48 AM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fc2d16d75fa03d73ea81fee4ff230ad4158b821e

Parents:

952682018dfb5a9d68e53a49515369fa1838590d

Message:

better handling of ssiToBeClosed on ssi:fork

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

File:

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

Singular/ssiLink.cc

@@ -517 +517 @@
       if (pid==0) /*child*/
       {
-        link_list hh=ssiToBeClosed;
+        link_list hh=(link_list)ssiToBeClosed->next;
+        /* we know: l is the first entry in ssiToBeClosed-list */
         while(hh!=NULL)
         {
-          if (hh->l!=l)
-          {
-            ssiInfo *dd=(ssiInfo*)hh->l->data;
-            fclose(dd->f_read);
-            fclose(dd->f_write);
-            if (dd->r!=NULL) rKill(dd->r);
-            omFreeSize((ADDRESS)dd,(sizeof *dd));
-            hh->l->data=NULL;
-            SI_LINK_SET_CLOSE_P(hh->l);
-          }
-          hh=(link_list)hh->next;
+          ssiInfo *dd=(ssiInfo*)hh->l->data;
+          fclose(dd->f_read);
+          fclose(dd->f_write);
+          if (dd->r!=NULL) rKill(dd->r);
+          omFreeSize((ADDRESS)dd,(sizeof *dd));
+          hh->l->data=NULL;
+          SI_LINK_SET_CLOSE_P(hh->l);
+          link_list nn=(link_list hh->next;
+          omFree(hh);
+          hh=nn;
         }
+        ssiToBeClosed->next=NULL;
         close(pc[1]); close(cp[0]);
         d->f_read=fdopen(pc[0],"r");