Changeset 7a81686 in git

Timestamp:

Mar 8, 2011, 3:35:04 PM (12 years ago)

Author:

Andreas Steenpaß <steenpas@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

cf29d0c4a67afdf6039daded7f0bcbd17622873a

Parents:

8a9bcca97de899994799612c3fb8014a6b008467

Message:

waitfirst and waitall adjusted

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

Location:

Singular

Files:

• iparith.cc (modified) (4 diffs)
• ssiLink.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -3198 +3198 @@
 static BOOLEAN jjWAIT1ST2(leftv res, leftv u, leftv v)
 {
+// input: u: a list with links of type
+//           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
+//        v: timeout for select in seconds
+//           or 0 for polling
+// returns: ERROR (via Werror): timeout negative
+//           0: timeout (or polling): none ready
+//           i>0: (at least) L[i] is ready
   lists Lforks = (lists)u->Data();
   int t = (int)(long)v->Data();
+  if(t < 0)
+  {
+    WerrorS("negative timeout"); return TRUE;
+  }
   int i = slStatusSsiL(Lforks, t*1000);
-  if ( i < 0 ) i = 0;
   res->data = (void*)(long)i;
   return FALSE;
@@ -3207 +3217 @@
 static BOOLEAN jjWAITALL2(leftv res, leftv u, leftv v)
 {
-/* returns 1 iff all forks are finished; 0 otherwise */
-  lists Lforks = (lists)u->Data();
+// input: u: a list with links of type
+//           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
+//        v: timeout for select in seconds
+//           or 0 for polling
+// returns: ERROR (via Werror): timeout negative
+//           0: timeout (or polling): none ready
+//           1: all links are ready
+  lists Lforks = (lists)u->CopyD();
   int timeout = 1000*(int)(long)v->Data();
-  lists oneFork=(lists)omAllocBin(slists_bin);
-  oneFork->Init(1);
+  if(timeout < 0)
+  {
+    WerrorS("negative timeout"); return TRUE;
+  }
+  int t = getRTimer()/timer_resolution;
   int i;
-  int t = getTimer();
   int ret = 1;
-  for (int j = 0; j <= Lforks->nr; j++)
-  {
-    oneFork->m[0].Copy(&Lforks->m[j]);
-    i = slStatusSsiL(oneFork, timeout);
-    if (i == 1)
-    {
-      timeout = timeout - getTimer() + t;
-    }
-    else { ret = 0; j = Lforks->nr+1; /* terminate the for loop */ }
-    omFreeSize((ADDRESS)oneFork->m,sizeof(sleftv));
-  }
-  omFreeBin((ADDRESS)oneFork, slists_bin);
+  for(int nfinished = 0; nfinished < Lforks->nr; nfinished++)
+  {
+    i = slStatusSsiL(Lforks, timeout);
+    if(i > 0)
+    {
+      Lforks->m[i-1].CleanUp();
+      Lforks->m[i-1].rtyp=DEF_CMD;
+      Lforks->m[i-1].data=NULL;
+      timeout = si_max(0,timeout - getRTimer()/timer_resolution + t);
+    }
+    else { ret = 0; break; /* terminate the for loop */ }
+  }
+  Lforks->Clean();
   res->data = (void*)(long)ret;
   return FALSE;
@@ -4597 +4616 @@
 BOOLEAN jjWAIT1ST1(leftv res, leftv a)
 {
+// input: a: a list with links of type
+//           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
+// returns: i>0: (at least) a[i] is ready
   lists Lforks = (lists)a->Data();
   int i = slStatusSsiL(Lforks, -1);
-  while (i <= 0) i = slStatusSsiL(Lforks, 10000000); /* redo this all 10 seconds */
   res->data = (void*)(long)i;
   return FALSE;
@@ -4605 +4626 @@
 BOOLEAN jjWAITALL1(leftv res, leftv a)
 {
-  lists Lforks = (lists)a->Data();
-  lists oneFork=(lists)omAllocBin(slists_bin);
-  oneFork->Init(1);
+// input: a: a list with links of type
+//           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
+// returns: nothing. All links are ready when finished.
+  lists Lforks = (lists)u->CopyD();
   int i;
-  for (int j = 0; j <= Lforks->nr; j++)
-  {
-    oneFork->m[0].Copy(&Lforks->m[j]);
-    i = slStatusSsiL(oneFork, -1);
-    while (i != 1) i = slStatusSsiL(oneFork, 10000000); /* redo this all 10 seconds */
-    omFreeSize((ADDRESS)oneFork->m,sizeof(sleftv));
-  }
-  omFreeBin((ADDRESS)oneFork, slists_bin);
+  for(int nfinished = 0; nfinished < Lforks->nr; nfinished++)
+  {
+    i = slStatusSsiL(Lforks, -1);
+    Lforks->m[i-1].CleanUp();
+    Lforks->m[i-1].rtyp=DEF_CMD;
+    Lforks->m[i-1].data=NULL;
+  }
+  Lforks->Clean();
   return FALSE;
 }

Singular/ssiLink.cc

@@ -1218 +1218 @@
   for(i=L->nr; i>=0; i--)
   {
-    if (L->m[i].Typ()!=LINK_CMD)
-    { WerrorS("all elements must be of type link"); return -2;}
-    l=(si_link)L->m[i].Data();
-    if(SI_LINK_OPEN_P(l)==0)
-    { WerrorS("all links must be open"); return -2;}
-    if (((strcmp(l->m->type,"ssi")!=0) && (strcmp(l->m->type,"MPtcp")!=0))
-    || ((strcmp(l->mode,"fork")!=0) && (strcmp(l->mode,"tcp")!=0)
-       && (strcmp(l->mode,"launch")!=0)))
-    {
-      WerrorS("all links must be of type ssi:fork, ssi:tcp, MPtcp:fork or MPtcp:launch");
-      return -2;
-    }
+    if (L->m[i].Typ()!=DEF_CMD)
+    {
+      if (L->m[i].Typ()!=LINK_CMD)
+      { WerrorS("all elements must be of type link"); return -2;}
+      l=(si_link)L->m[i].Data();
+      if(SI_LINK_OPEN_P(l)==0)
+      { WerrorS("all links must be open"); return -2;}
+      if (((strcmp(l->m->type,"ssi")!=0) && (strcmp(l->m->type,"MPtcp")!=0))
+      || ((strcmp(l->mode,"fork")!=0) && (strcmp(l->mode,"tcp")!=0)
+        && (strcmp(l->mode,"launch")!=0)))
+      {
+        WerrorS("all links must be of type ssi:fork, ssi:tcp, MPtcp:fork or MPtcp:launch");
+        return -2;
+      }
     #ifdef HAVE_MPSR
-    if (strcmp(l->m->type,"ssi")==0)
-    {
+      if (strcmp(l->m->type,"ssi")==0)
+      {
+        d=(ssiInfo*)l->data;
+        d_fd=d->fd_read;
+      }
+      else
+      {
+        dd=(MP_Link_pt)l->data;
+        d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
+      }
+    #else
       d=(ssiInfo*)l->data;
       d_fd=d->fd_read;
-    }
-    else
-    {
-      dd=(MP_Link_pt)l->data;
-      d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
-    }
-    #else
-    d=(ssiInfo*)l->data;
-    d_fd=d->fd_read;
     #endif
-    FD_SET(d_fd, &mask);
-    if (d_fd > max_fd) max_fd=d_fd;
+      FD_SET(d_fd, &mask);
+      if (d_fd > max_fd) max_fd=d_fd;
+    }
   }
   max_fd++;
@@ -1286 +1289 @@
     for(i=L->nr; i>=0; i--)
     {
-      l=(si_link)L->m[i].Data();
-      #ifdef HAVE_MPSR
-      if (strcmp(l->m->type,"ssi")!=0)
-      {
-        // for MP links, return here:
-        dd=(MP_Link_pt)l->data;
-        d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
-        if(j==d_fd) return i+1;
-      }
-      else
-      {
+      if (L->m[i].rtyp==LINK_CMD)
+      {
+        l=(si_link)L->m[i].Data();
+        #ifdef HAVE_MPSR
+        if (strcmp(l->m->type,"ssi")!=0)
+        {
+          // for MP links, return here:
+          dd=(MP_Link_pt)l->data;
+          d_fd=((MP_TCP_t *)dd->transp.private1)->sock;
+          if(j==d_fd) return i+1;
+        }
+        else
+        {
+          d=(ssiInfo*)l->data;
+          d_fd=d->fd_read;
+          if(j==d_fd) break;
+        }
+        #else
         d=(ssiInfo*)l->data;
         d_fd=d->fd_read;
         if(j==d_fd) break;
-      }
-      #else
-      d=(ssiInfo*)l->data;
-      d_fd=d->fd_read;
-      if(j==d_fd) break;
-      #endif
+        #endif
+      }
     }
     // only ssi links: