Changeset b5f276e in git

Timestamp:

Sep 20, 2010, 3:05:09 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

3f46965e1ad849ccb6d39d9e57cca2ecbbf10d86

Parents:

5d651dc1723c0ceef3e8c472352840a2c713d8a4

Message:

additional parameter for slOpen: make fork links global

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

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• mpsr_sl.cc (modified) (1 diff)
• pipeLink.cc (modified) (3 diffs)
• silink.cc (modified) (7 diffs)
• silink.h (modified) (2 diffs)
• ssiLink.cc (modified) (5 diffs)
• ssiLink.h (modified) (1 diff)

Singular/iparith.cc

@@ -2701 +2701 @@
 #else
   si_link l=(si_link)u->Data();
-  if (slOpen(l,SI_LINK_WRITE)) return TRUE;
+  if (slOpen(l,SI_LINK_WRITE,u)) return TRUE;
   if(strcmp(l->m->type,"ASCII")!=0)
   {
@@ -4899 +4899 @@
 {
   si_link l=(si_link)v->Data();
-  if (iiOp==OPEN_CMD) return slOpen(l, SI_LINK_OPEN);
+  if (iiOp==OPEN_CMD) return slOpen(l, SI_LINK_OPEN,v);
   else                return slClose(l);
 }

Singular/mpsr_sl.cc

@@ -558 +558 @@
   omFree(istr);
   // open link
-  if (slOpen(silink, SI_LINK_OPEN))
+  if (slOpen(silink, SI_LINK_OPEN,NULL))
   {
     fprintf(stderr, "Batch side could not connect on port %s and host %s\n",

Singular/pipeLink.cc

@@ -38 +38 @@
 
 //**************************************************************************/
-BOOLEAN pipeOpen(si_link l, short flag)
+BOOLEAN pipeOpen(si_link l, short flag, leftv u)
 {
   pipeInfo *d=(pipeInfo*)omAlloc0(sizeof(pipeInfo));
@@ -128 +128 @@
 LINKAGE BOOLEAN pipeWrite(si_link l, leftv data)
 {
-  if(!SI_LINK_W_OPEN_P(l)) slOpen(l,SI_LINK_OPEN|SI_LINK_WRITE);
+  if(!SI_LINK_W_OPEN_P(l)) slOpen(l,SI_LINK_OPEN|SI_LINK_WRITE,NULL);
   pipeInfo *d = (pipeInfo *)l->data;
   FILE *outfile=d->f_write;;
@@ -195 +195 @@
 si_link_extension slInitPipeExtension(si_link_extension s)
 {
-  s->Open=(slOpenProc)pipeOpen;
-  s->Close=(slCloseProc)pipeClose;
-  s->Kill=(slKillProc)pipeKill;
-  s->Read=(slReadProc)pipeRead1;
+  s->Open=pipeOpen;
+  s->Close=pipeClose;
+  s->Kill=pipeKill;
+  s->Read=pipeRead1;
   s->Read2=(slRead2Proc)NULL;
-  s->Write=(slWriteProc)pipeWrite;
+  s->Write=pipeWrite;
 
   s->Status=slStatusPipe;

Singular/silink.cc

@@ -189 +189 @@
 
 //--------------------------------------------------------------------------
-BOOLEAN slOpen(si_link l, short flag)
+BOOLEAN slOpen(si_link l, short flag, leftv h)
 {
   BOOLEAN res;
@@ -202 +202 @@
   }
   else if (l->m->Open != NULL)
-    res = l->m->Open(l, flag);
+    res = l->m->Open(l, flag, h);
   else
     res = TRUE;
 
+  const char *c="_";;
+  if (h!=NULL) c=h->Name();
+
   if (res)
-    Werror("open: Error for link of type: %s, mode: %s, name: %s",
-           l->m->type, l->mode, l->name);
+    Werror("open: Error for link %s of type: %s, mode: %s, name: %s",
+           c, l->m->type, l->mode, l->name);
   return res;
 }
@@ -243 +246 @@
 #endif
 #endif
-    if (slOpen(l, SI_LINK_READ)) return NULL;
+    if (slOpen(l, SI_LINK_READ,NULL)) return NULL;
   }
 
@@ -290 +293 @@
 #endif
 #endif
-    if (slOpen(l, SI_LINK_WRITE)) return TRUE;
+    if (slOpen(l, SI_LINK_WRITE,NULL)) return TRUE;
   }
 
@@ -319 +322 @@
   if(! SI_LINK_W_OPEN_P(l)) // open w ?
   {
-    if (slOpen(l, SI_LINK_WRITE)) return TRUE;
+    if (slOpen(l, SI_LINK_WRITE,NULL)) return TRUE;
   }
 
@@ -348 +351 @@
   if(! SI_LINK_R_OPEN_P(l)) // open r ?
   {
-    if (slOpen(l, SI_LINK_READ)) return TRUE;
+    if (slOpen(l, SI_LINK_READ,NULL)) return TRUE;
   }
 
@@ -374 +377 @@
 
 /* =============== ASCII ============================================= */
-BOOLEAN slOpenAscii(si_link l, short flag)
+BOOLEAN slOpenAscii(si_link l, short flag, leftv h)
 {
   const char *mode;

Singular/silink.h

@@ -13 +13 @@
 
 // extension links:
-typedef BOOLEAN    (*slOpenProc)(si_link l, short flag);
+typedef BOOLEAN    (*slOpenProc)(si_link l, short flag, leftv h);
 typedef BOOLEAN    (*slWriteProc)(si_link l, leftv lv);
 typedef BOOLEAN    (*slCloseProc)(si_link l);
@@ -67 +67 @@
 #define SI_LINK_SET_RW_OPEN_P(l) ((l)->flags |= (SI_LINK_OPEN | SI_LINK_READ | SI_LINK_WRITE))
 
-BOOLEAN slOpen(si_link l, short flag);
+BOOLEAN slOpen(si_link l, short flag, leftv h);
 BOOLEAN slClose(si_link l);
 leftv   slRead(si_link l,leftv a=NULL);

Singular/ssiLink.cc

@@ -464 +464 @@
 
 //**************************************************************************/
-BOOLEAN ssiOpen(si_link l, short flag)
+BOOLEAN ssiOpen(si_link l, short flag, leftv u)
 {
   const char *mode;
@@ -505 +505 @@
         myynest=0;
         fe_fgets_stdin=fe_fgets_dummy;
+        if ((u!=NULL)&&(u->rtyp==IDHDL))
+        {
+          idhdl h=(idhdl)u->data;
+          h->lev=0;
+        }
         loop
         {
@@ -845 +850 @@
 LINKAGE BOOLEAN ssiWrite(si_link l, leftv data)
 {
-  if(!SI_LINK_W_OPEN_P(l)) slOpen(l,SI_LINK_OPEN|SI_LINK_WRITE);
+  if(!SI_LINK_W_OPEN_P(l)) slOpen(l,SI_LINK_OPEN|SI_LINK_WRITE,NULL);
   ssiInfo *d = (ssiInfo *)l->data;
   d->level++;
@@ -935 +940 @@
 si_link_extension slInitSsiExtension(si_link_extension s)
 {
-  s->Open=(slOpenProc)ssiOpen;
-  s->Close=(slCloseProc)ssiClose;
-  s->Kill=(slKillProc)ssiClose;
-  s->Read=(slReadProc)ssiRead1;
+  s->Open=ssiOpen;
+  s->Close=ssiClose;
+  s->Kill=ssiClose;
+  s->Read=ssiRead1;
   s->Read2=(slRead2Proc)NULL;
-  s->Write=(slWriteProc)ssiWrite;
+  s->Write=ssiWrite;
 
   s->Status=slStatusSsi;
@@ -1076 +1081 @@
   sprintf(buf,"ssi:connect %s:%s",host,port);
   slInit(l, buf);
-  slOpen(l,SI_LINK_OPEN);
+  slOpen(l,SI_LINK_OPEN,NULL);
   SI_LINK_SET_RW_OPEN_P(l);
   loop

Singular/ssiLink.h

@@ -9 +9 @@
  #ifndef SSILINK_H
  #define SSILINK_H
-BOOLEAN ssiOpen(si_link l, short flag);
+BOOLEAN ssiOpen(si_link l, short flag, leftv u);
 BOOLEAN ssiWrite(si_link l, leftv v);
 leftv ssiRead1(si_link l);