Changeset 1edbcdd in git

Timestamp:

Mar 11, 2011, 1:38:26 PM (12 years ago)

Author:

Andreas Steenpaß <steenpas@…>

Branches:

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

Children:

240d6e0f71a7c78b7ad7e858be185c519c48c85f

Parents:

2404eaa111daafc0bf19376132cb7a10c7f21daf

Message:

handling of crashed ssi links in waitall and waitfirst

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

Files:

• Singular/iparith.cc (modified) (7 diffs)
• Singular/misc_ip.cc (modified) (1 diff)
• Singular/ssiLink.cc (modified) (7 diffs)
• Singular/table.h (modified) (1 diff)
• doc/reference.doc (modified) (previous)

Singular/iparith.cc

@@ -3203 +3203 @@
 //           or 0 for polling
 // returns: ERROR (via Werror): timeout negative
-//           0: timeout (or polling): none ready
+//           -1: the read state of all links is eof
+//            0: timeout (or polling): none ready
 //           i>0: (at least) L[i] is ready
   lists Lforks = (lists)u->Data();
@@ -3212 +3213 @@
   }
   int i = slStatusSsiL(Lforks, t*1000);
+  if(i == -2) /* error */
+  {
+    return TRUE;
+  }
   res->data = (void*)(long)i;
   return FALSE;
@@ -3222 +3227 @@
 //           or 0 for polling
 // returns: ERROR (via Werror): timeout negative
+//           -1: the read state of all links is eof
 //           0: timeout (or polling): none ready
 //           1: all links are ready
+//              (caution: at least one is ready, but some maybe dead)
   lists Lforks = (lists)u->CopyD();
   int timeout = 1000*(int)(long)v->Data();
@@ -3232 +3239 @@
   int t = 1000*getRTimer()/TIMER_RESOLUTION;
   int i;
-  int ret = 1;
-  for(int nfinished = 0; nfinished < Lforks->nr; nfinished++)
+  int ret = -1;
+  for(int nfinished = 0; nfinished < Lforks->nr+1; nfinished++)
   {
     i = slStatusSsiL(Lforks, timeout);
-    if(i > 0)
-    {
+    if(i > 0) /* Lforks[i] is ready */
+    {
+      ret = 1;
       Lforks->m[i-1].CleanUp();
       Lforks->m[i-1].rtyp=DEF_CMD;
@@ -3243 +3251 @@
       timeout = si_max(0,timeout - 1000*getRTimer()/TIMER_RESOLUTION + t);
     }
-    else { ret = 0; break; /* terminate the for loop */ }
+    else /* terminate the for loop */
+    {
+      if(i == -2) /* error */
+      {
+        return TRUE;
+      }
+      if(i == 0) /* timeout */
+      {
+        ret = 0;
+      }
+      break;
+    }
   }
   Lforks->Clean();
@@ -4618 +4637 @@
 // input: u: a list with links of type
 //           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
-// returns: i>0: (at least) a[i] is ready
+// returns: -1:  the read state of all links is eof
+//          i>0: (at least) u[i] is ready
   lists Lforks = (lists)u->Data();
   int i = slStatusSsiL(Lforks, -1);
+  if(i == -2) /* error */
+  {
+    return TRUE;
+  }
   res->data = (void*)(long)i;
   return FALSE;
@@ -4628 +4652 @@
 // input: u: a list with links of type
 //           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
-// returns: nothing. All links are ready when finished.
+// returns: -1: the read state of all links is eof
+//           1: all links are ready
+//              (caution: at least one is ready, but some maybe dead)
   lists Lforks = (lists)u->CopyD();
   int i;
-  for(int nfinished = 0; nfinished < Lforks->nr; nfinished++)
+  int j = -1;
+  for(int nfinished = 0; nfinished < Lforks->nr+1; nfinished++)
   {
     i = slStatusSsiL(Lforks, -1);
+    if(i == -2) /* error */
+    {
+      return TRUE;
+    }
+    if(i == -1)
+    {
+      break;
+    }
+    j = 1;
     Lforks->m[i-1].CleanUp();
     Lforks->m[i-1].rtyp=DEF_CMD;
     Lforks->m[i-1].data=NULL;
   }
+  res->data = (void*)(long)j;
   Lforks->Clean();
   return FALSE;

Singular/misc_ip.cc

@@ -1059 +1059 @@
   else
   {
-      printf("\nhalt %d\n",i);
+      if(!singular_in_batchmode)
+      {
+        printf("\nhalt %d\n",i);
+      }
   }
   #ifdef HAVE_MPSR

Singular/ssiLink.cc

@@ -1197 +1197 @@
 {
 // input: L: a list with links of type
-//           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
+//           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch.
+//           Note: Not every entry in L must be set.
 //        timeout: timeout for select in micro-seconds
 //           or -1 for infinity
@@ -1203 +1204 @@
 // returns: ERROR (via Werror): L has wrong elements or link not open
 //           -2: select returns an error
-//           0: timeout or (polling): none ready
+//           -1: the read state of all links is eof
+//           0:  timeout (or polling): none ready,
 //           i>0: (at least) L[i] is ready
   si_link l;
@@ -1212 +1214 @@
   int d_fd;
   fd_set  mask, fdmask;
+  FD_ZERO(&fdmask);
   FD_ZERO(&mask);
-  int max_fd=0; /* max fd in fd_set */
-  struct timeval wt;
+  int max_fd=0; /* 1 + max fd in fd_set */
+
+  /* timeout */
+  struct timespec wt;
+  int startingtime = getRTimer()/TIMER_RESOLUTION;  // in seconds
+  struct timespec *wt_ptr=&wt;
+  if (timeout== -1)
+  {
+    wt_ptr=NULL;
+  }
+  else
+  {
+    wt.tv_sec  = timeout / 1000000;
+    wt.tv_nsec = 1000 * (timeout % 1000000);
+  }
+
+  /* signal mask for pselect() */
+  sigset_t sigmask;
+  if(sigprocmask(SIG_SETMASK, NULL, &sigmask) < 0)
+  {
+    WerrorS("error in sigprocmask()");
+    return -2;
+  }
+  if(sigaddset(&sigmask, SIGCHLD) < 0)
+  {
+    WerrorS("error in sigaddset()");
+    return -2;
+  }
+
+  /* auxiliary variables */
   int i;
+  int j;
+  int k;
+  int s;
+  char fdmaskempty;
+
+  /* check the links and fill in fdmask */
   for(i=L->nr; i>=0; i--)
   {
@@ -1229 +1266 @@
         && (strcmp(l->mode,"launch")!=0)))
       {
-        WerrorS("all links must be of type ssi:fork, ssi:tcp, MPtcp:fork or MPtcp:launch");
+        WerrorS("all links must be of type ssi:fork, ssi:tcp, MPtcp:fork\n");
+        WerrorS("or MPtcp:launch");
         return -2;
       }
@@ -1247 +1285 @@
       d_fd=d->fd_read;
     #endif
-      FD_SET(d_fd, &mask);
+      FD_SET(d_fd, &fdmask);
       if (d_fd > max_fd) max_fd=d_fd;
     }
   }
   max_fd++;
-  struct timeval *wt_ptr=&wt;
-  if (timeout== -1)
-  {
-    wt_ptr=NULL;
-  }
-  else
-  {
-    wt.tv_sec  = timeout / 1000000;
-    wt.tv_usec = timeout % 1000000;
-  }
+
+do_select:
+  /* copy fdmask to mask */
+  FD_ZERO(&mask);
+  for(k = 0; k < max_fd; k++)
+  {
+    if(FD_ISSET(k, &fdmask))
+    {
+      FD_SET(k, &mask);
+    }
+  }
+
   /* check with select: chars waiting: no -> not ready */
-  int s= select(max_fd, &mask, NULL, NULL, wt_ptr);
+  s = pselect(max_fd, &mask, NULL, NULL, wt_ptr, &sigmask);
+Print("\nselect: %d\n", s);
   if (s==-1)
   { 
@@ -1269 +1310 @@
     return -2; /*error*/
   }
-  int j;
-  int retry_needed=0;
-find_next_fd:
   if (s==0)
   {
-    if (retry_needed)
-    {
-      // the os reported that one of the (ssi) links is ready,
-      // but it was only white space: this cannot happen again:
-      return slStatusSsiL(L,timeout);
-    }
-    else
-      return 0; /*poll: not ready */
+    return 0; /*poll: not ready */
   }
   else /* s>0, at least one ready  (the number of fd which are ready is s)*/
@@ -1322 +1353 @@
       int c=fgetc(d->f_read);
       //Print("try c=%d\n",c);
-      if (c== -1) /* eof or error*/
-      {
-        retry_needed=1;
-        FD_CLR(j,&mask);
-        s--;
-        goto find_next_fd;
-      }
+      if (c== -1) /* eof */
+      {
+        FD_CLR(j,&fdmask);
+        fdmaskempty = 1;
+        for(k = 0; k < max_fd; k++)
+        {
+          if(FD_ISSET(k, &fdmask))
+          {
+            fdmaskempty = 0;
+            break;
+          }
+        }
+        if(fdmaskempty)
+        {
+          return -1;
+        }
+        if(timeout != -1)
+        {
+          timeout = si_max(0,
+               timeout - 1000000*(getRTimer()/TIMER_RESOLUTION - startingtime));
+          wt.tv_sec  = timeout / 1000000;
+          wt.tv_nsec = 1000 * (timeout % 1000000);
+        }
+        goto do_select;
+      }
+
       else if (isdigit(c))
       { ungetc(c,d->f_read); d->ungetc_buf='\1'; return i+1; }

Singular/table.h

@@ -282 +282 @@
 ,{D(loNewtonP),    NEWTONPOLY_CMD,  IDEAL_CMD,      IDEAL_CMD     , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjWAIT1ST1),   WAIT1ST_CMD,     INT_CMD,        LIST_CMD      , ALLOW_PLURAL |ALLOW_RING}
-,{D(jjWAITALL1),   WAITALL_CMD,     NONE,           LIST_CMD      , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjWAITALL1),   WAITALL_CMD,     INT_CMD,        LIST_CMD      , ALLOW_PLURAL |ALLOW_RING}
 ,{NULL,             0,               0,              0             , NO_PLURAL |NO_RING}
 };