Changeset 97c955 in git

Timestamp:

Nov 29, 2013, 3:41:32 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')

Children:

d349786aef1f8f2b89aa38d805322367d4c96364

Parents:

c42a9f75e7b92be96e4b082346d946500227e213

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-29 15:41:32+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-29 15:41:51+01:00

Message:

fix: ring dep. stuff in newstruct: send/receive via links (ssi:6)

from master

Location:

Singular

Files:

• links/silink.cc (modified) (2 diffs)
• links/silink.h (modified) (2 diffs)
• links/ssiLink.cc (modified) (9 diffs)
• newstruct.cc (modified) (2 diffs)

Singular/links/silink.cc

@@ -192 +192 @@
 
 //--------------------------------------------------------------------------
+BOOLEAN slSetRingDummy(si_link, ring r, BOOLEAN send)
+{
+  if (currRing!=r) rChangeCurrRing(r);
+  return FALSE;
+}
 BOOLEAN slOpen(si_link l, short flag, leftv h)
 {
@@ -218 +223 @@
              c, l->m->type, l->mode, l->name);
     }
+    if (l->m->SetRing==NULL) l->m->SetRing=slSetRingDummy;
   }
   return res;

Singular/links/silink.h

@@ -30 +30 @@
 typedef BOOLEAN    (*slGetDumpProc)(si_link l);
 typedef const char* (*slStatusProc)(si_link l, const char *request);
+typedef BOOLEAN    (*slSetRingProc)(si_link l, ring r, BOOLEAN send);
 
 struct s_si_link_extension
@@ -44 +45 @@
   slGetDumpProc    GetDump;
   slStatusProc     Status;
+  slSetRingProc    SetRing;
   const char       *type;
 };

Singular/links/ssiLink.cc

@@ -53 +53 @@
 #include <Singular/si_signals.h>
 
-#define SSI_VERSION 5
+#define SSI_VERSION 6
+// 5->6: changed newstruct representation
 
 // 64 bit version:
@@ -163 +164 @@
       {
         mpz_t tmp;
-        mpz_init_set_si(tmp,nn);
+        mpz_init_set_si(tmp,nn);
         fputs("8 ",d->f_write);
         mpz_out_str (d->f_write,32, tmp);
         fputc(' ',d->f_write);
-        mpz_clear(tmp);
+        mpz_clear(tmp);
       }
       #endif
@@ -434 +435 @@
        {
          LONG dd=s_readlong(d->f_read);
-         //#if SIZEOF_LONG == 8
+         //#if SIZEOF_LONG == 8
          return INT_TO_SR(dd);
-         //#else
-         //return nlInit(dd,NULL);
-         //#endif
+         //#else
+         //return nlInit(dd,NULL);
+         //#endif
        }
      case 5:
@@ -1230 +1231 @@
              // we are in the top-level, so set the basering to d->r:
              if (d->r!=NULL)
-             {
-               d->r->ref++;
+             {
+               d->r->ref++;
                ssiSetCurrRing(d->r);
-             }
+             }
              if (t==15) return ssiRead1(l);
            }
@@ -1289 +1290 @@
     case 19: res->rtyp=BIGINTMAT_CMD;
              res->data=ssiReadBigintmat(d);
-             break;
+             break;
     case 20: ssiReadBlackbox(res,l);
              break;
@@ -1311 +1312 @@
                 #endif
                 si_opt_1=n98_o1;
-                si_opt_2=n98_o2;
+                si_opt_2=n98_o2;
                 return ssiRead1(l);
              }
@@ -1332 +1333 @@
 }
 //**************************************************************************/
+BOOLEAN ssiSetRing(si_link l, ring r, BOOLEAN send)
+{
+  if(SI_LINK_W_OPEN_P(l)==0)
+     if (slOpen(l,SI_LINK_OPEN|SI_LINK_WRITE,NULL)) return TRUE;
+  ssiInfo *d = (ssiInfo *)l->data;
+  if (d->r!=r)
+  {
+    if (send)
+    {
+      fputs("15 ",d->f_write);
+      ssiWriteRing(d,r);
+    }
+    d->r=r;
+  }
+  if (currRing!=r) rChangeCurrRing(r);
+  return FALSE;
+}
+//**************************************************************************/
+
 BOOLEAN ssiWrite(si_link l, leftv data)
 {
@@ -1463 +1483 @@
 
   s->Status=slStatusSsi;
+  s->SetRing=ssiSetRing;
   s->type="ssi";
   return s;
@@ -2010 +2031 @@
 // 19 bigintmat <r> <c> ...
 //
-// 20 blackbox <name> ...
+// 20 blackbox <name> 1 <len> ...
 //
 // 98: verify version: <ssi-version> <MAX_TOK> <OPT1> <OPT2>

Singular/newstruct.cc

@@ -578 +578 @@
   f->m->Write(f, &l);
   lists ll=(lists)d;
-  memset(&l,0,sizeof(l));
-  l.rtyp=LIST_CMD;
-  l.data=ll;
+  int Ll=lSize(ll);
+  l.rtyp=INT_CMD;
+  l.data=(void*)(long)Ll;
   f->m->Write(f, &l);
-  return FALSE;
-}
-
-BOOLEAN newstruct_deserialize(blackbox **/*b*/, void **d, si_link f)
-{
-  // newstruct is serialiazed as a list,
+  // set all entries corresponding to "real" mebers to 1 in rings
+  char *rings=(char*)omAlloc0(Ll+1);
+  newstruct_member elem=dd->member;
+  while (elem!=NULL)
+  {
+    rings[elem->pos]='\1';
+    elem=elem->next;
+  }
+  int i;
+  BOOLEAN ring_changed=FALSE;
+  ring save_ring=currRing;
+  for(i=0;i<=Ll;i++)
+  {
+    if (rings[i]=='\0') // ring entry for pos i+1
+    {
+      if (ll->m[i].data!=NULL)
+      {
+        ring_changed=TRUE;
+        f->m->SetRing(f,(ring)ll->m[i].data,TRUE);
+      }
+    }
+    f->m->Write(f,&(ll->m[i]));
+  }
+  if (ring_changed)
+    f->m->SetRing(f,save_ring,FALSE);
+}
+
+BOOLEAN newstruct_deserialize(blackbox **b, void **d, si_link f)
+{
+  // newstruct is serialiazed as analog to a list,
   // just read a list and take data,
   // rtyp must be set correctly (to the blackbox id) by routine calling
   // newstruct_deserialize
-  leftv l=f->m->Read(f);
+  leftv l=f->m->Read(f); // int: length of list
+  int Ll=(int)(long)(l->data);
+  omFree(l);
+  lists L=(lists)omAllocBin(slists_bin);
+  L->Init(Ll+1);
+  for(int i=0;i<=Ll;i++)
+  {
+    l=f->m->Read(f);
+    memcpy(&(L->m[i]),l,sizeof(sleftv));
+    omFree(l);
+  }
   //newstruct_desc n=(newstruct_desc)b->data;
   //TODO: check compatibility of list l->data with description in n
-  *d=l->data;
+  *d=L;
   return FALSE;
 }
@@ -763 +797 @@
   return scanNewstructFromString(s,res);
 }
+
 void newstructShow(newstruct_desc d)
 {