Changeset f47847f in git

Timestamp:

Sep 21, 2010, 7:02:05 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

2cc567ccdbc100de452f04837e7b0808bd32a390

Parents:

cf3808042943877e2ddb788b8ee0457117d4f891

Message:

a global list of ssi:fork links: ssiToBeClosed

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

File:

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

Singular/ssiLink.cc

@@ -47 +47 @@
 } ssiInfo;
 
+
+typedef struct
+{
+  leftv u;
+  si_link l;
+  void * next;
+} link_struct;
+
+typedef link_struct* link_list;
+
+link_list ssiToBeClosed=NULL;
+
 // the helper functions:
 void ssiSetCurrRing(const ring r)
@@ -492 +504 @@
     if (strcmp(mode,"fork")==0)
     {
+      link_list n=(link_list)omAlloc(sizeof(link_struct));
+      n->u=u;
+      n->l=l;
+      n->next=(void *)ssiToBeClosed;
+      ssiToBeClosed=n;
+
       int pc[2];
       int cp[2];
@@ -499 +517 @@
       if (pid==0) /*child*/
       {
+        link_list hh=ssiToBeClosed;
+        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;
+        }
         close(pc[1]); close(cp[0]);
         d->f_read=fdopen(pc[0],"r");
@@ -510 +543 @@
         myynest=0;
         fe_fgets_stdin=fe_fgets_dummy;
-        if ((u!=NULL)&&(u->rtyp==IDHDL))
-        {
-          idhdl h=(idhdl)u->data;
-          h->lev=0;
-        }
+        if ((u!=NULL)&&(u->rtyp==IDHDL))
+        {
+          idhdl h=(idhdl)u->data;
+          h->lev=0;
+        }
         loop
         {
@@ -685 +718 @@
       struct sockaddr_in serv_addr;
       struct hostent *server;
-  
+
       sscanf(l->name,"%255[^:]:%d",host,&portno);
       //Print("connect to host %s, port %d\n",host,portno);mflush();
@@ -697 +730 @@
         serv_addr.sin_family = AF_INET;
         memcpy((char *)&serv_addr.sin_addr.s_addr,
-              (char *)server->h_addr,
+              (char *)server->h_addr,
               server->h_length);
         serv_addr.sin_port = htons(portno);
         if (connect(sockfd,(sockaddr*)&serv_addr,sizeof(serv_addr)) < 0)
         { WerrorS("ERROR connecting"); return TRUE; }
-        //PrintS("connected\n");mflush();
+        //PrintS("connected\n");mflush();
         d->f_read=fdopen(sockfd,"r");
         d->fd_read=sockfd;
@@ -708 +741 @@
         d->fd_write=sockfd;
         SI_LINK_SET_RW_OPEN_P(l);
-        omFree(host);
+        omFree(host);
       }
       else
@@ -764 +797 @@
     {
       fprintf(d->f_write,"99\n");fflush(d->f_write);
+      link_list hh=ssiToBeClosed;
+      if (hh->l==l)
+      {
+         ssiToBeClosed=(link_list)hh->next;
+         omFreeSize(hh,sizeof(link_struct));
+      }
+      else while(hh!=NULL)
+      {
+        link_list hhh=(link_list)hh->next;
+        if (hhh->l==l)
+        {
+          hh->next=hhh->next;
+          omFreeSize(hhh,sizeof(link_struct));
+          break;
+        }
+        hh=(link_list)hh->next;
+      }
     }
     if (d->f_read!=NULL) fclose(d->f_read);
@@ -884 +934 @@
     {
           case NONE/* nothing*/:fprintf(d->f_write,"16 ");
-                          break;
+                          break;
           case STRING_CMD: fprintf(d->f_write,"2 ");
                            ssiWriteString(d,(char *)dd);
@@ -1062 +1112 @@
   int s= select(max_fd, &mask, NULL, NULL, wt_ptr);
   if (s==-1) return -2; /*error*/
-  if (s==0) 
+  if (s==0)
   {
     return -1; /*poll: not ready */