Changeset b9861d in git for Singular

Timestamp:

Mar 26, 2024, 3:30:16 PM (8 weeks ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

c557548eb377680a027b43841f5c96858e4e28d9

Parents:

bf5adf058537f0a83a68bcae3705ae81c3b87e22

Message:

poll for status

File:

• Singular/links/ssiLink.cc (modified) (8 diffs)

Singular/links/ssiLink.cc

@@ -1885 +1885 @@
   && (strcmp(request, "read") == 0))
   {
+    if (s_isready(d->f_read)) return "ready";
+#ifdef HAVE_POLL
+    pollfd pfd;
+    loop
+    {
+      /* Don't block. Return socket status immediately. */
+      pfd.fd=d->fd_read;
+      pfd.events=POLLIN;
+      //Print("test fd %d\n",d->fd_read);
+    /* check with select: chars waiting: no -> not ready */
+      switch (si_poll(&pfd,1,0))
+      {
+        case 0: /* not ready */ return "not ready";
+        case -1: /*error*/      return "error";
+        case 1: /*ready ? */    break;
+      }
+#else
     fd_set  mask;
     struct timeval wt;
-    if (s_isready(d->f_read)) return "ready";
     if (FD_SETSIZE<=d->fd_read)
     {
@@ -1910 +1926 @@
         case 1: /*ready ? */    break;
       }
+#endif
     /* yes: read 1 char*/
     /* if \n, check again with select else ungetc(c), ready*/
@@ -1940 +1957 @@
 int slStatusSsiL(lists L, int timeout)
 {
+  PrintS("select 1\n");
 // input: L: a list with links of type
 //           ssi-connect, ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch.
@@ -1955 +1973 @@
   int d_fd;
   int s;
-#ifdef HAVE_POLL
+//#ifdef HAVE_POLL
+#if 0
   int nfd=L->nr+1;
   int wait_for=0;
@@ -1961 +1980 @@
   for(int i=L->nr; i>=0; i--)
   {
+    pfd[i].fd=-1;
     if (L->m[i].Typ()!=DEF_CMD)
     {
@@ -1999 +2019 @@
   if (timeout>0) timeout=timeout/1000000;
 do_poll:
-  s=poll(pfd,nfd,timeout);
+  s=si_poll(pfd,nfd,timeout);
   if (s==-1)
   {
@@ -2027 +2047 @@
             return i+1;
           }
-          if (pfd[i].revents &POLLERR)
+          if (pfd[i].revents) // anything else
           {
             wait_for--;
-            pfd[i].events=0;
+            pfd[i].fd=-1;
+            pfd[i].events=0;
           }
         }
@@ -2037 +2058 @@
   }
   // none ready, wait again:
-  if ((timeout!=0)&&(wait_for>0)) goto do_poll;
-  return 0;
+  if ((timeout<0)&&(wait_for>0)) goto do_poll;
+  if (timeout==0) return 0;
+  return -1;
 #else
   fd_set  mask, fdmask;