Changeset ac408e in git for Singular

Timestamp:

Apr 5, 2024, 9:56:50 AM (6 weeks ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

805b275bfbf361cabc7496aecd096561cf92d6d6

Parents:

a62276379e845035043ef5363b2130f08145d39e

Message:

new select/poll call for waitfirst/waitall

Location:

Singular

Files:

• LIB/tasks.lib (modified) (1 diff)
• iparith.cc (modified) (5 diffs)
• links/silink.h (modified) (1 diff)
• links/ssiLink.cc (modified) (5 diffs)

Singular/LIB/tasks.lib

@@ -746 +746 @@
             if (code == 3) {   // got result
                 id = read(l(pid_parent));
-                close(links[assignment[id]]);
-                if (nlinks > granted_leaves) {
-                    tmp = system("semaphore", "release", sem_leaves);
+                if(typeof(links[assignment[id]])=="link")
+                {
+                  close(links[assignment[id]]);
+                }
+                if (nlinks > granted_leaves)
+                {
+                  tmp = system("semaphore", "release", sem_leaves);
                 }
                 links[assignment[id]] = def(0);

Singular/iparith.cc

@@ -3695 +3695 @@
   if(t < 0)
   {
-    WerrorS("negative timeout"); return TRUE;
-  }
-  int i = slStatusSsiL(Lforks, t*1000);
+    t= -1;
+  }
+  int i = slStatusSsiL(Lforks, t);
   if(i == -2) /* error */
   {
@@ -3711 +3711 @@
 //        v: timeout for select in milliseconds
 //           or 0 for polling
+//           or -1 for infinite
 // returns: ERROR (via Werror): timeout negative
-//           -1: the read state of all links is eof
+//           -1: the read state of all links is eof or error
 //           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();
+  lists L = (lists)u->Data();
+  BOOLEAN* ignore=(BOOLEAN*)omAlloc0((L->nr+1)*sizeof(BOOLEAN));
+  int timeout = (int)(long)v->Data();
   if(timeout < 0)
   {
-    WerrorS("negative timeout"); return TRUE;
+    timeout=-1;
   }
   int t = getRTimer()/TIMER_RESOLUTION;  // in seconds
   int i;
   int ret = -1;
-  for(unsigned nfinished = 0; nfinished < ((unsigned)Lforks->nr)+1; nfinished++)
-  {
-    i = slStatusSsiL(Lforks, timeout);
-    if(i > 0) /* Lforks[i] is ready */
+  for(unsigned nfinished = 0; nfinished <= ((unsigned)L->nr); nfinished++)
+  {
+    i = slStatusSsiL(L, timeout, ignore);
+    if(i > 0) /* L[i] is ready */
     {
       ret = 1;
-      Lforks->m[i-1].CleanUp();
-      Lforks->m[i-1].rtyp=DEF_CMD;
-      Lforks->m[i-1].data=NULL;
+      ignore[i-1]=TRUE;
       timeout = si_max(0,timeout - 1000*(getRTimer()/TIMER_RESOLUTION - t));
     }
     else /* terminate the for loop */
     {
+      omFreeSize(ignore,(L->nr+1)*sizeof(BOOLEAN));
       if(i == -2) /* error */
       {
@@ -3749 +3750 @@
     }
   }
-  Lforks->Clean();
   res->data = (void*)(long)ret;
   return FALSE;
@@ -5543 +5543 @@
 // input: u: a list with links of type
 //           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
-// returns: -1:  the read state of all links is eof
+// returns: -1:  the read state of all links is eof or error
 //          i>0: (at least) u[i] is ready
   lists Lforks = (lists)u->Data();
@@ -5558 +5558 @@
 // input: u: a list with links of type
 //           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
-// returns: -1: the read state of all links is eof
+// returns: -1: the read state of all links is eof or error
 //           1: all links are ready
 //              (caution: at least one is ready, but some maybe dead)
-  lists Lforks = (lists)u->CopyD();
+  lists L = (lists)u->Data();
   int i;
   int j = -1;
-  for(int nfinished = 0; nfinished < Lforks->nr+1; nfinished++)
-  {
-    i = slStatusSsiL(Lforks, -1);
+  BOOLEAN* ignore=(BOOLEAN*)omAlloc0((L->nr+1)*sizeof(BOOLEAN));
+  for(int nfinished = 0; nfinished <= L->nr; nfinished++)
+  {
+    i = slStatusSsiL(L, -1, ignore);
     if(i == -2) /* error */
     {
-      Lforks->Clean();
+      omFreeSize(ignore,(L->nr+1)*sizeof(BOOLEAN));
       return TRUE;
     }
-    if(i == -1)
-    {
+    if((i == -1)||(j==0))
+    {
+      j=-1;
       break;
     }
-    j = 1;
     if (i>0)
     {
-      Lforks->m[i-1].CleanUp();
-      Lforks->m[i-1].rtyp=DEF_CMD;
-      Lforks->m[i-1].data=NULL;
-    }
-  }
+      j=1;
+      ignore[i-1]=TRUE;
+    }
+  }
+  omFreeSize(ignore,(L->nr+1)*sizeof(BOOLEAN));
   res->data = (void*)(long)j;
-  Lforks->Clean();
   return FALSE;
 }

Singular/links/silink.h

@@ -115 +115 @@
 EXTERN_VAR omBin ip_link_bin;
 
-int slStatusSsiL(lists L, int timeout);
+int slStatusSsiL(lists L, int timeout, BOOLEAN* ignore=NULL);
 int ssiBatch(const char *host, const char * port);
 

Singular/links/ssiLink.cc

@@ -1955 +1955 @@
 }
 
-int slStatusSsiL(lists L, int timeout)
+int slStatusSsiL(lists L, int timeout, BOOLEAN *ignore)
 {
 // input: L: a list with links of type
 //           ssi-connect, 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
+//        timeout: timeout for select in milli-seconds
 //           or -1 for infinity
 //           or 0 for polling
 // returns: ERROR (via Werror): L has wrong elements or link not open
-//           -2: select returns an error
+//           -2: error in L
 //           -1: the read state of all links is eof
 //           0:  timeout (or polling): none ready,
@@ -1975 +1975 @@
   int nfd=L->nr+1;
   pollfd *pfd=(pollfd*)omAlloc0(nfd*sizeof(pollfd));
+#else
+  fd_set  fdmask;
+  FD_ZERO(&fdmask);
+  int max_fd=0; /* 1 + max fd in fd_set */
+  /* timeout */
+  struct timeval wt;
+  struct timeval *wt_ptr=&wt;
+  if (timeout== -1)
+  {
+    wt_ptr=NULL;
+  }
+  else
+  {
+    wt.tv_sec  = timeout / 1000;
+    wt.tv_usec = (timeout % 1000)*1000;
+  }
+#endif
   for(int i=L->nr; i>=0; i--)
   {
+#if defined(HAVE_POLL) && !defined(__APPLE__)
     pfd[i].fd=-1;
+#endif
     if (L->m[i].Typ()!=DEF_CMD)
     {
@@ -1998 +2017 @@
         if (!s_isready(d->f_read))
         {
+#if defined(HAVE_POLL) && !defined(__APPLE__)
           pfd[i].fd=d_fd;
           pfd[i].events=POLLIN;
-        }
-        else
-        {
-          return i+1;
-        }
-      }
-      else
-      {
-        Werror("wrong link type >>%s<<",l->m->type);
-        return -2;
-      }
-    }
-  }
-  if (timeout>0) timeout=timeout/1000;
-  s=si_poll(pfd,nfd,timeout);
-  if (s==-1)
-  {
-    WerrorS("error in poll call");
-    return -2; /*error*/
-  }
-  if(s==0)
-  {
-    return 0; /*timeout*/
-  }
-  for(int i=L->nr; i>=0; i--)
-  {
-    if (L->m[i].rtyp==LINK_CMD)
-    {
-      // the link type is ssi, that's already tested
-      l=(si_link)L->m[i].Data();
-      d=(ssiInfo*)l->data;
-      d_fd=d->fd_read;
-      if (pfd[i].fd==d_fd)
-      {
-        if (pfd[i].revents &POLLIN)
-        {
-          omFree(pfd);
-          return i+1;
-        }
-      }
-    }
-  }
-  // none ready
-  return 0;
 #else
-  fd_set  mask, fdmask;
-  FD_ZERO(&fdmask);
-  FD_ZERO(&mask);
-  int max_fd=0; /* 1 + max fd in fd_set */
-
-  /* timeout */
-  struct timeval wt;
-  struct timeval *wt_ptr=&wt;
-  int startingtime = getRTimer()/TIMER_RESOLUTION;  // in seconds
-  if (timeout== -1)
-  {
-    wt_ptr=NULL;
-  }
-  else
-  {
-    wt.tv_sec  = timeout / 1000000;
-    wt.tv_usec = timeout % 1000000;
-  }
-
-  /* auxiliary variables */
-  int i;
-  int j;
-  int k;
-  char fdmaskempty;
-
-  /* check the links and fill in fdmask */
-  /* check ssi links for ungetc_buf */
-  for(i=L->nr; i>=0; i--)
-  {
-    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) && (strcmp(l->mode,"connect")!=0)))
-      {
-        WerrorS("all links must be of type ssi:fork, ssi:tcp, ssi:connect");
-        return -2;
-      }
-      if (strcmp(l->m->type,"ssi")==0)
-      {
-        d=(ssiInfo*)l->data;
-        d_fd=d->fd_read;
-        if (!s_isready(d->f_read))
-        {
           if (FD_SETSIZE<=d_fd)
           {
@@ -2101 +2028 @@
           FD_SET(d_fd, &fdmask);
           if (d_fd > max_fd) max_fd=d_fd;
+#endif
         }
         else
+        {
           return i+1;
+        }
       }
       else
@@ -2111 +2041 @@
       }
     }
-  }
-  max_fd++;
-  if (FD_SETSIZE<=max_fd)
-  {
-    Werror("file descriptor number too high (%d)",max_fd);
-    return -2;
-  }
-
-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 */
-  s = si_select(max_fd, &mask, NULL, NULL, wt_ptr);
+    else if (ignore!=NULL)
+    {
+      ignore[i]=TRUE; // not a link
+    }
+  }
+#if defined(HAVE_POLL) && !defined(__APPLE__)
+  s=si_poll(pfd,nfd,timeout);
+#else
+  s = si_select(max_fd, &fdmask, NULL, NULL, wt_ptr);
+#endif
   if (s==-1)
   {
-    WerrorS("error in select call");
+    WerrorS("error in poll/select call");
     return -2; /*error*/
   }
-  if (s==0)
-  {
-    return 0; /*poll: not ready */
-  }
-  else /* s>0, at least one ready  (the number of fd which are ready is s)*/
-  {
-    j=0;
-    while (j<=max_fd) { if (FD_ISSET(j,&mask)) break; j++; }
-    for(i=L->nr; i>=0; i--)
-    {
-      if (L->m[i].rtyp==LINK_CMD)
-      {
-        l=(si_link)L->m[i].Data();
-        // only ssi links:
-        d=(ssiInfo*)l->data;
-        d_fd=d->fd_read;
-        if(j==d_fd) break;
-      }
-    }
-    loop
-    {
-      /* yes: read 1 char*/
-      /* if \n, check again with select else ungetc(c), ready*/
-      /* setting: d: current ssiInfo, j current fd, i current entry in L*/
-      int c=s_getc(d->f_read);
-      //Print("try c=%d\n",c);
-      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_usec = (timeout % 1000000);
-        }
-        goto do_select;
-      }
-
-      else if (isdigit(c))
-      { s_ungetc(c,d->f_read); return i+1; }
-      else if (c>' ')
-      {
-        Werror("unknown char in ssiLink(%d)",c);
-        return -2;
-      }
-      /* else: next char */
-      goto do_select;
-    }
-  }
+  if(s==0)
+  {
+    return 0; /*timeout*/
+  }
+  for(int i=L->nr; i>=0; i--)
+  {
+    if ((L->m[i].rtyp==LINK_CMD)
+    && ((ignore==NULL)||(ignore[i]==FALSE)))
+    {
+      // the link type is ssi, that's already tested
+      l=(si_link)L->m[i].Data();
+      d=(ssiInfo*)l->data;
+      d_fd=d->fd_read;
+#if defined(HAVE_POLL) && !defined(__APPLE__)
+      if (pfd[i].fd==d_fd)
+      {
+        if (pfd[i].revents &POLLIN)
+        {
+          omFree(pfd);
+          if (ignore!=NULL) ignore[i]=TRUE;
+          return i+1;
+        }
+      }
+#else
+      if (FD_ISSET(d_fd, &fdmask))
+      {
+        if (ignore!=NULL) ignore[i]=TRUE;
+        return i+1;
+      }
 #endif
+    }
+  }
+  // no ready
+  return 0;
 }