Changeset fcafdb in git

Timestamp:

Feb 27, 2001, 4:50:04 PM (22 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

8cfee1c3269a440dc074eae208795fd4da490c0e

Parents:

c2f5270fb552e6b92d376b11a283d939362193a4

Message:

gdbm-related stuff for win32


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

Location:

Singular

Files:

• silink.cc (modified) (3 diffs)
• sing_dbm.cc (modified) (3 diffs)
• sing_dbm.h (modified) (2 diffs)

Singular/silink.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: silink.cc,v 1.38 2000-12-12 08:44:52 obachman Exp $ */
+/* $Id: silink.cc,v 1.39 2001-02-27 15:50:04 levandov Exp $ */
 
 /*
@@ -211 +211 @@
 leftv slRead(si_link l, leftv a)
 {
+  char *mode;
   leftv v = NULL;
   if( ! SI_LINK_R_OPEN_P(l)) // open r ?
   {
+#ifdef HAVE_DBM
+#ifdef USE_GDBM
+    if (! SI_LINK_CLOSE_P(l))
+      {
+        if (slClose(l)) return NULL;
+      }
+#endif
+#endif
     if (slOpen(l, SI_LINK_READ)) return NULL;
   }
@@ -253 +262 @@
   if(! SI_LINK_W_OPEN_P(l)) // open w ?
   {
+#ifdef HAVE_DBM
+#ifdef USE_GDBM
+    if (! SI_LINK_CLOSE_P(l))
+      {
+        if (slClose(l)) return TRUE;
+      }
+#endif
+#endif
     if (slOpen(l, SI_LINK_WRITE)) return TRUE;
   }
 
-  if(SI_LINK_W_OPEN_P(l))
+  if (SI_LINK_W_OPEN_P(l))
   { // now open w
     if (l->m->Write != NULL)

Singular/sing_dbm.cc

@@ -5 +5 @@
 //**************************************************************************/
 //
-// $Id: sing_dbm.cc,v 1.15 2000-12-12 08:44:53 obachman Exp $
+// $Id: sing_dbm.cc,v 1.16 2001-02-27 15:50:04 levandov Exp $
 //
 //**************************************************************************/
@@ -27 +27 @@
 #  include "silink.h"
 #  include "sing_dbm.h"
-
+#ifdef USE_GDBM
+#  include "gdbm.h"
+#endif
+
+
+#ifdef USE_GDBM
+typedef struct {
+  GDBM_FILE db;        // pointer to open database
+  int first;      // firstkey to look for?
+  datum actual;  // the actual key
+} GDBM_info;
+
+//**************************************************************************/
+LINKAGE BOOLEAN dbOpen(si_link l, short flag)
+{
+  char *mode = "r";
+  GDBM_info *db;
+  datum d_key;
+  //  int dbm_flags = O_RDONLY | O_CREAT;  // open database readonly as default
+  int read_write= GDBM_READER; 
+
+  if(flag & SI_LINK_WRITE)
+  {
+    if((l->mode==NULL)
+    || ((l->mode[0]!='w')&&(l->mode[1]!='w')))
+    {
+      // request w- open, but mode is not "w" nor "rw" => fail
+      return TRUE;
+    }
+    //    dbm_flags = O_RDWR | O_CREAT;
+    read_write =  GDBM_WRCREAT;
+    mode = "rw";
+  }
+  if(flag & SI_LINK_READ)
+    {
+      if (strcmp(l->mode,"rw")==0) mode="rw";   
+    }
+  //if (((db = (DBM_info *)omAlloc(sizeof *db)) != NULL)
+  //&&((db->db = dbm_open(l->name, dbm_flags, 0664 )) != NULL ))
+  db = (GDBM_info *)omAlloc0(sizeof *db);
+  if((db->db = gdbm_open(l->name, BLOCKSIZE, read_write, 0664, 0)) != NULL )
+  {
+//     if (db->first) // first created?
+//       {
+//         db->actual=gdbm_firstkey(db->db);
+//       }
+//     else
+//       {
+//     d_key=db->actual;
+//     if (d_key.dptr!=NULL)
+//       {
+//         db->actual=gdbm_nextkey(db->db,db->actual);
+//       }
+//     else { db->actual=gdbm_firstkey(db->db); }
+//      }
+    db->first=1;
+    if(flag & SI_LINK_WRITE)
+      SI_LINK_SET_W_OPEN_P(l);
+    else
+      SI_LINK_SET_R_OPEN_P(l);
+    l->data=(void *)(db);
+    omFree(l->mode);
+    l->mode=omStrDup(mode);
+    return FALSE;
+  }
+  return TRUE;
+}
+
+//**************************************************************************/
+LINKAGE BOOLEAN dbClose(si_link l)
+{
+  GDBM_info *db = (GDBM_info *)l->data;
+  gdbm_close(db->db);
+  omFreeSize((ADDRESS)db,(sizeof *db));
+  l->data=NULL;  
+  SI_LINK_SET_CLOSE_P(l);
+  return FALSE;
+}
+
+//**************************************************************************/
+static datum d_value;
+LINKAGE leftv dbRead2(si_link l, leftv key)
+{
+  GDBM_info *db = (GDBM_info *)l->data;
+  // GDBM_info *db;
+//   db = (GDBM_info *)omAlloc0(sizeof *db);
+//   db = (GDBM_info *)l->data;
+  leftv v=NULL;
+  datum d_key;
+  int flag;
+
+  if (!SI_LINK_R_OPEN_P(l)) //exceptions
+    //  if (strcmp(l->mode,"rw")==0) //rw-mode
+    {
+      if (!SI_LINK_CLOSE_P(l))
+        {
+          if (!dbClose(l)) {Print("cannot close link!\n");}
+        }
+      //(SI_LINK_CLOSE_P(l)) automatically      
+      dbOpen(l, SI_LINK_READ);
+    }
+  if (SI_LINK_RW_OPEN_P(l)) {Print("I/O Error!\n");}
+
+  if(key!=NULL)
+  {
+    if (key->Typ()==STRING_CMD)
+    {
+      d_key.dptr = (char*)key->Data();
+      d_key.dsize = strlen(d_key.dptr)+1;
+      d_value = gdbm_fetch(db->db, d_key);
+      v=(leftv)omAlloc0Bin(sleftv_bin);
+      if (d_value.dptr!=NULL) v->data=omStrDup(d_value.dptr);
+      else                    v->data=omStrDup("");
+      v->rtyp=STRING_CMD;
+    }
+    else
+    {
+      WerrorS("read(`GDBM link`,`string`) expected");
+    }
+  }
+  else
+  {
+    if (db->first)
+    {
+      db->first=0;
+      d_key = gdbm_firstkey(db->db);
+   //    db->actual=d_key;
+//       Print("firstkey:%s\n",d_key.dptr);
+    }
+    else
+    {
+      if (db->actual.dptr==NULL)
+      {
+        db->actual=gdbm_firstkey(db->db);
+      }
+      d_key = gdbm_nextkey(db->db,db->actual);
+      db->actual=d_key;
+      if (d_key.dptr==NULL)
+      {
+        db->first=1;
+      // Print("nextkey:NULL\n");
+      }
+     //  else
+//       Print("nextkey:%s\n",d_key.dptr);
+    }
+
+    if (d_key.dptr!=NULL)
+      d_value = gdbm_fetch(db->db, d_key);
+    else
+      d_value.dptr=NULL;
+
+    v=(leftv)omAlloc0Bin(sleftv_bin);
+    v->rtyp=STRING_CMD;
+    if (d_value.dptr!=NULL)
+    {
+      v->data=omStrDup(d_key.dptr);
+      db->first = 0;
+    }
+    else
+    {
+      v->data=omStrDup("");
+      //      db->first = 1;
+    }
+
+  }
+  return v;
+}
+LINKAGE leftv dbRead1(si_link l)
+{
+  return dbRead2(l,NULL);
+}
+//**************************************************************************/
+LINKAGE BOOLEAN dbWrite(si_link l, leftv key)
+{
+  GDBM_info *db = (GDBM_info *)l->data;
+ //  GDBM_info *db;
+//   db = (GDBM_info *)omAlloc0(sizeof *db);
+//   db = (GDBM_info *)l->data;
+  BOOLEAN b=TRUE;
+  register int ret;
+  
+  if (strcmp(l->mode,"rw")!=0) // r-mode
+    {
+      Print("Write error on readonly source\n");
+    }
+  else //rw-mode
+    {
+      if (!SI_LINK_W_OPEN_P(l)) //exceptions
+        {
+          if (!SI_LINK_CLOSE_P(l))
+            {
+              if (!dbClose(l)) {Print("close error\n");};
+            }
+          if (!dbOpen(l,SI_LINK_WRITE)) {Print("open_for_write error\n");}
+        }
+    }
+
+  if((key!=NULL) && (key->Typ()==STRING_CMD) )
+  { 
+    if (key->next!=NULL)                   // have a second parameter ?
+    {
+      if(key->next->Typ()==STRING_CMD)     // replace (key,value)
+      {
+        datum d_key, d_value;
+
+        d_key.dptr = (char *)key->Data();
+        d_key.dsize = strlen(d_key.dptr)+1;
+        d_value.dptr = (char *)key->next->Data();
+        d_value.dsize = strlen(d_value.dptr)+1;
+        ret  = gdbm_store(db->db, d_key, d_value, GDBM_REPLACE);
+//         db->actual=d_key;
+        if (ret==-1) {Print("reader calls gdbm_store!");}
+        if (ret==0)
+          { b=FALSE; }
+        else
+        {
+          //          if(gdbm_error(db->db))
+          if (gdbm_errno!=0)
+          {
+            //              Werror("GDBM link I/O error. Is '%s' readonly?", l->name);
+            Print(gdbm_strerror(gdbm_errno));
+            //dbm_clearerr(db->db);
+            //            gdbm_errno=0;
+          }
+        }
+      }
+    }
+    else
+    {                               // delete (key)
+      datum d_key;
+
+      d_key.dptr = (char *)key->Data();
+      d_key.dsize = strlen(d_key.dptr)+1;
+ //      db->actual=gdbm_nextkey(db->db,d_key);
+      gdbm_delete(db->db, d_key);
+      b=FALSE;
+    }
+  }
+  else
+  {
+    WerrorS("write(`GDBM link`,`key string` [,`data string`]) expected");
+  }
+  return b;
+}
+#endif /* USE_GDBM */
+
+#ifndef USE_GDBM
 /* These are the routines in dbm. */
 #  include "ndbm.h"
@@ -206 +452 @@
 //**************************************************************************/
 
+#endif /* USE_GDBM */
 #endif /* HAVE_DBM */

Singular/sing_dbm.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sing_dbm.h,v 1.4 1999-11-15 17:20:48 obachman Exp $ */
+/* $Id: sing_dbm.h,v 1.5 2001-02-27 15:50:04 levandov Exp $ */
 /*
 * ABSTRACT: interface to DBM links
@@ -11 +11 @@
 #include "structs.h"
 
+#ifdef ix86_Win
+#ifdef HAVE_DBM
+#  define GDBM_STATIC
+#  define USE_GDBM
+#  define BLOCKSIZE 1024
+#endif
+#endif
+
 si_link_extension slInitDBMExtension(si_link_extension s);
 #endif