Changeset 6c70ef in git

Timestamp:

Nov 3, 2010, 5:56:28 PM (13 years ago)

Author:

Andreas Steenpaß <steenpas@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

5ea590e388164e5c1a86e89caca6ca5d46eb37e9

Parents:

8a4e22c96f254f73c703a940d895136b87451b5c

Message:

	new commands: waitall, waitfirst

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

Files:

• Singular/extra.cc (modified) (1 diff)
• Singular/iparith.cc (modified) (2 diffs)
• Singular/ssiLink.cc (modified) (4 diffs)
• Singular/table.h (modified) (3 diffs)
• Singular/tok.h (modified) (1 diff)
• doc/reference.doc (modified) (previous)

Singular/extra.cc

@@ -629 +629 @@
         {
           Werror( "expected valid file name as a string");
-          return FALSE;
+          return TRUE;
+        }
+      }
+  /*==================== forking experiments ======================*/
+      if(strcmp(sys_cmd, "waitforssilinks")==0)
+      {
+        if ((h != NULL) && (h->Typ() == LIST_CMD) &&
+            (h->next != NULL) && (h->next->Typ() == INT_CMD))
+        {
+          lists L = (lists)h->Data();
+          int timeMillisec = (int)(long)h->next->Data();
+          int n = slStatusSsiL(L, timeMillisec * 1000);
+          res->rtyp = INT_CMD;
+          res->data = (void*)n;
+          return FALSE;
+        }
+        else
+        {
+          Werror( "expected list of open ssi links and timeout");
+          return TRUE;
         }
       }

Singular/iparith.cc

@@ -207 +207 @@
 
 /*=================== operations with 2 args.: static proc =================*/
+static BOOLEAN jjWAIT1ST2(leftv res, leftv u, leftv v)
+{
+  lists Lforks = (lists)u->Data();
+  int t = (int)(long)v->Data();
+  int i = slStatusSsiL(Lforks, t*1000);
+  if ( i < 0 ) i = 0;
+  res->data = (void*)(long)i;
+  return FALSE;
+}
+/* returns 1 iff all forks are finished; 0 otherwise */
+static BOOLEAN jjWAITALL2(leftv res, leftv u, leftv v)
+{
+  lists Lforks = (lists)u->Data();
+  int timeout = 1000*(int)(long)v->Data();
+  lists oneFork=(lists)omAllocBin(slists_bin);
+  oneFork->Init(1);
+  int i;
+  int t = getTimer();
+  int ret = 1;
+  for (int j = 0; j <= Lforks->nr; j++)
+  {
+    oneFork->m[0].Copy(&Lforks->m[j]);
+    i = slStatusSsiL(oneFork, timeout);
+    if (i == 1)
+    {
+      timeout = timeout - getTimer() + t;
+    }
+    else { ret = 0; j = Lforks->nr+1; /* terminate the for loop */ }
+    omFreeSize((ADDRESS)oneFork->m,sizeof(sleftv));
+  }
+  omFreeBin((ADDRESS)oneFork, slists_bin);
+  res->data = (void*)(long)ret;
+  return FALSE;
+}
+
 static BOOLEAN jjOP_IV_I(leftv res, leftv u, leftv v)
 {
@@ -3686 +3721 @@
 
 /*=================== operations with 1 arg.: static proc =================*/
+
+BOOLEAN jjWAIT1ST1(leftv res, leftv a)
+{
+  lists Lforks = (lists)a->Data();
+  int i = slStatusSsiL(Lforks, -1);
+  while (i <= 0) i = slStatusSsiL(Lforks, 10000000); /* redo this all 10 seconds */
+  res->data = (void*)(long)i;
+  return FALSE;
+}
+
+BOOLEAN jjWAITALL1(leftv res, leftv a)
+{
+  lists Lforks = (lists)a->Data();
+  lists oneFork=(lists)omAllocBin(slists_bin);
+  oneFork->Init(1);
+  int i;
+  for (int j = 0; j <= Lforks->nr; j++)
+  {
+    oneFork->m[0].Copy(&Lforks->m[j]);
+    i = slStatusSsiL(oneFork, -1);
+    while (i != 1) i = slStatusSsiL(oneFork, 10000000); /* redo this all 10 seconds */
+    omFreeSize((ADDRESS)oneFork->m,sizeof(sleftv));
+  }
+  omFreeBin((ADDRESS)oneFork, slists_bin);
+  return FALSE;
+}
+
 static BOOLEAN jjDUMMY(leftv res, leftv u)
 {

Singular/ssiLink.cc

@@ -1117 +1117 @@
   struct timeval wt;
   int i;
-  for(i=L->nr-1; i>=0; i--)
+  for(i=L->nr; i>=0; i--)
   {
     if (L->m[i].Typ()!=LINK_CMD)
@@ -1125 +1125 @@
     { WerrorS("all links must be open"); return -2;}
     if ((strcmp(l->m->type,"ssi")!=0)
-    && (strcmp(l->mode,"fork")!=0) || (strcmp(l->mode,"tcp")!=NULL))
+    || ((strcmp(l->mode,"fork")!=0) && (strcmp(l->mode,"tcp")!=NULL)))
     { WerrorS("all links must be of type ssi:fork or ssi:tcp"); return -2;}
     d=(ssiInfo*)l->data;
@@ -1131 +1131 @@
     if (d->fd_read> max_fd) max_fd=d->fd_read;
   }
+  max_fd++;
   struct timeval *wt_ptr=&wt;
   if (timeout== -1)
@@ -1152 +1153 @@
     int j=0;
     while (j<=max_fd) { if (FD_ISSET(j,&mask)) break; j++; }
-    for(i=L->nr-1; i>=0; i--)
+    for(i=L->nr; i>=0; i--)
     {
       l=(si_link)L->m[i].Data();

Singular/table.h

@@ -266 +266 @@
 ,{D(jjLOAD1),      LOAD_CMD,        NONE,           STRING_CMD    , ALLOW_PLURAL |ALLOW_RING}
 ,{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}
 #ifdef HAVE_FANS
 //,{D(jjDELMCONE1),  DELMCONE_CMD,    NONE,           FAN_CMD       , ALLOW_PLURAL |ALLOW_RING}
@@ -644 +646 @@
 ,{D(jjVARSTR2),   VARSTR_CMD,     STRING_CMD,     RING_CMD,   INT_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjVARSTR2),   VARSTR_CMD,     STRING_CMD,     QRING_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjWAIT1ST2),  WAIT1ST_CMD,    INT_CMD,        LIST_CMD,   INT_CMD, ALLOW_PLURAL |ALLOW_RING}
+,{D(jjWAITALL2),  WAITALL_CMD,    INT_CMD,        LIST_CMD,   INT_CMD, ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjWEDGE),     WEDGE_CMD,      MATRIX_CMD,     MATRIX_CMD, INT_CMD, NO_PLURAL |ALLOW_RING}
 #ifdef HAVE_FANS
@@ -1076 +1080 @@
   { "vdim",        0, VDIM_CMD ,          CMD_1},
   { "vector",      0, VECTOR_CMD ,        RING_DECL},
+  { "waitfirst",   0, WAIT1ST_CMD ,       CMD_12},
+  { "waitall",     0, WAITALL_CMD ,       CMD_12},
   { "wedge",       0, WEDGE_CMD ,         CMD_2},
   { "weight",      0, WEIGHT_CMD ,        CMD_1},

Singular/tok.h

@@ -159 +159 @@
   VARIABLES_CMD,
   VARSTR_CMD,
+  WAIT1ST_CMD,
+  WAITALL_CMD,
   WRITE_CMD,
   /* start system var section: VECHO */