Changeset bc0078 in git for Singular/ssiLink.cc

Timestamp:

Mar 8, 2011, 11:52:46 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

8a9bcca97de899994799612c3fb8014a6b008467

Parents:

9803fba33946bae0120952e8ec3363d37dd5bc1a

Message:

error handling in slStatusSsiL

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

File:

• Singular/ssiLink.cc (modified) (5 diffs)

Singular/ssiLink.cc

@@ -606 +606 @@
         omFree(l->mode);
         l->mode = omStrDup(mode);
-        singular_in_batchmode=TRUE;
+        singular_in_batchmode=TRUE;
         SI_LINK_SET_RW_OPEN_P(l);
         //myynest=0;
@@ -1170 +1170 @@
       int c=fgetc(d->f_read);
       //Print("try c=%d\n",c);
-      if (c== -1) return "eof";
+      if (c== -1) return "eof"; /* eof or error */
       else if (isdigit(c))
       { ungetc(c,d->f_read); d->ungetc_buf='\1'; return "ready"; }
@@ -1196 +1196 @@
 int slStatusSsiL(lists L, int timeout)
 {
-// input: L: a list with snks of type 
-//           si-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
+// input: L: a list with links of type
+//           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch
 //        timeout: timeout for select in micro-seconds
 //           or -1 for infinity
@@ -1262 +1262 @@
   int s= select(max_fd, &mask, NULL, NULL, wt_ptr);
   if (s==-1) return -2; /*error*/
+  int j;
+  int retry_needed=0;
+find_next_fd:
   if (s==0)
   {
-    return 0; /*poll: not ready */
-  }
-  else /* s>0, at least one ready */
-  {
-    int j=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 */
+  }
+  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--)
@@ -1302 +1312 @@
       int c=fgetc(d->f_read);
       //Print("try c=%d\n",c);
-      if (c== -1) return 0;
+      if (c== -1) /* eof or error*/
+      {
+        retry_needed=1;
+        FD_CLR(j,&mask);
+        s--;
+        goto find_next_fd;
+      }
       else if (isdigit(c))
       { ungetc(c,d->f_read); d->ungetc_buf='\1'; return i+1; }