Changeset b19e8e in git

Timestamp:

Mar 22, 2024, 2:19:48 PM (7 weeks ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '854dc24078c9c998b9967f75c5e6fbe0e43b963e')

Children:

c1b4b44600babf6d7a56f4684f4ff14c98a41e20

Parents:

c1cb4469fcf4806587c032c0165d48cf7891316f

Message:

use poll for waitfirst/waitall

Location:

Singular

Files:

• iparith.cc (modified) (1 diff)
• links/ssiLink.cc (modified) (4 diffs)

Singular/iparith.cc

@@ -5576 +5576 @@
     }
     j = 1;
-    Lforks->m[i-1].CleanUp();
-    Lforks->m[i-1].rtyp=DEF_CMD;
-    Lforks->m[i-1].data=NULL;
+    if (i>0)
+    {
+      Lforks->m[i-1].CleanUp();
+      Lforks->m[i-1].rtyp=DEF_CMD;
+      Lforks->m[i-1].data=NULL;
+    }
   }
   res->data = (void*)(long)j;

Singular/links/ssiLink.cc

@@ -1954 +1954 @@
   ssiInfo *d=NULL;
   int d_fd;
-  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;
   int s;
-  char fdmaskempty;
-
-  /* check the links and fill in fdmask */
-  /* check ssi links for ungetc_buf */
-  for(i=L->nr; i>=0; i--)
+#ifdef HAVE_POLL
+  int nfd=L->nr+1;
+  int wait_for=0;
+  pollfd *pfd=(pollfd*)omAlloc0(nfd*sizeof(pollfd));
+  for(int i=L->nr; i>=0; i--)
   {
     if (L->m[i].Typ()!=DEF_CMD)
@@ -2004 +1981 @@
         if (!s_isready(d->f_read))
         {
+          pfd[i].fd=d_fd;
+          pfd[i].events=POLLIN;
+          wait_for++;
+        }
+        else
+        {
+          return i+1;
+        }
+      }
+      else
+      {
+        Werror("wrong link type >>%s<<",l->m->type);
+        return -2;
+      }
+    }
+  }
+  if (timeout>0) timeout=timeout/1000000;
+do_poll:
+  s=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;
+      //for(int j=nfd-1;j>=0;j--)
+      if (!s_isready(d->f_read))
+      {
+        if (pfd[i].fd==d_fd)
+        {
+          if (pfd[i].revents &POLLIN)
+          {
+            omFree(pfd);
+            return i+1;
+          }
+          if (pfd[i].revents &POLLERR)
+          {
+            wait_for--;
+            pfd[i].events=0;
+          }
+        }
+      }
+    }
+  }
+  // none ready, wait again:
+  if ((timeout!=0)&&(wait_for>0)) goto do_poll;
+  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)
           {
@@ -2060 +2145 @@
       {
         l=(si_link)L->m[i].Data();
-        if (strcmp(l->m->type,"ssi")==0)
-        {
-          d=(ssiInfo*)l->data;
-          d_fd=d->fd_read;
-          if(j==d_fd) break;
-        }
-        else
-        {
-          Werror("wrong link type >>%s<<",l->m->type);
-          return -2;
-        }
-      }
-    }
-    // only ssi links:
+        // only ssi links:
+        d=(ssiInfo*)l->data;
+        d_fd=d->fd_read;
+        if(j==d_fd) break;
+      }
+    }
     loop
     {
@@ -2118 +2195 @@
     }
   }
+#endif
 }