Changeset 525 for trunk

Timestamp:

1999-09-02T21:50:43+12:00 (25 years ago)

Author:

rjmcnab

Message:

added need_filelock option to open

Location:

trunk/gsdl/packages/wingdbm

Files:

• gdbmdefs.h (modified) (1 diff)
• gdbmopen.c (modified) (4 diffs)
• gdbmreorg.c (modified) (1 diff)
• proto.h (modified) (1 diff)

trunk/gsdl/packages/wingdbm/gdbmdefs.h

@@ -161 +161 @@
     void (*fatal_err) ();
 
+    int need_filelock;
+
     /* The gdbm file descriptor which is set in gdbm_open.  */
     int  desc;

trunk/gsdl/packages/wingdbm/gdbmopen.c

@@ -60 +60 @@
 
 gdbm_file_info *
-gdbm_open (file, block_size, flags, mode, fatal_func)
+gdbm_open (file, block_size, flags, mode, fatal_func, need_filelock)
      char *file;
      int  block_size;
@@ -66 +66 @@
      int  mode;
      void (*fatal_func) ();
+     int need_filelock;
 {
   gdbm_file_info *dbf;      /* The record to return. */
@@ -91 +92 @@
   /* Initialize some fields for known values.  This is done so gdbm_close
      will work if called before allocating some structures. */
+  dbf->need_filelock = need_filelock;
   dbf->dir  = NULL;
   dbf->bucket = NULL;
@@ -166 +168 @@
     }
       /* Sets lock_val to 0 for success.  See systems.h. */
-      READLOCK_FILE(dbf);
+      if (dbf->need_filelock) {
+          READLOCK_FILE(dbf);
+      } else {
+          lock_val = 0;
+      }
     }
   else
     {
       /* Sets lock_val to 0 for success.  See systems.h. */
-      WRITELOCK_FILE(dbf);
+      if (dbf->need_filelock) {
+        WRITELOCK_FILE(dbf);
+      } else {
+          lock_val = 0;
+      }
     }
   if (lock_val != 0)

trunk/gsdl/packages/wingdbm/gdbmreorg.c

@@ -182 +182 @@
 
   /* Fix up DBF to have the correct information for the new file. */
-  UNLOCK_FILE(dbf);
+  if (dbf->need_filelock) {
+      UNLOCK_FILE(dbf);
+  }
   close (dbf->desc);
   free (dbf->header);

trunk/gsdl/packages/wingdbm/proto.h

@@ -76 +76 @@
 gdbm_file_info *gdbm_open _ARGS((char *file, int block_size,
                  int flags, int mode,
-                 void (*fatal_func) (void)));
+                 void (*fatal_func) (void), int need_filelock));
 int   gdbm_reorganize     _ARGS((gdbm_file_info *dbf ));
 datum gdbm_firstkey       _ARGS((gdbm_file_info *dbf ));