Changeset 523

Timestamp:

1999-09-02T21:44:30+12:00 (25 years ago)

Author:

rjmcnab

Message:

added file locking for windows

Location:

trunk/gsdl/packages/wingdbm

Files:

• global.c (modified) (2 diffs)
• systems.h (modified) (2 diffs)

trunk/gsdl/packages/wingdbm/global.c

@@ -35 +35 @@
 #include "gdbmerrno.h"
 
+#include <io.h>
+#include <windows.h>
 
 /* The global variables used for the "original" interface. */
@@ -45 +47 @@
 /* The dbm error number is placed in the variable GDBM_ERRNO. */
 gdbm_error gdbm_errno = GDBM_NO_ERROR;
+
+
+/* a simple locking function for windows that uses file descriptors */
+int my_locking(int fh, int lmode, long lockoffset, long nbytes) {
+    int result = -1;
+    int trys = 10;
+
+    lseek (fh, lockoffset, L_SET);
+
+    while (trys > 0 && result != 0) {
+        if (lmode == MY_UNLOCK) {
+            if (UnlockFile((HANDLE)_get_osfhandle(fh),lockoffset,0,nbytes,0))
+                result = 0;
+
+        } else if (lmode == MY_READLOCK) {
+/*          if (LockFileEx((HANDLE)_get_osfhandle(fh),0,0,nbytes,0,0))*/
+            if (LockFile((HANDLE)_get_osfhandle(fh),lockoffset,0,nbytes,0))
+                result = 0;
+
+        } else if (lmode == MY_WRITELOCK) {
+            if (LockFile((HANDLE)_get_osfhandle(fh),lockoffset,0,nbytes,0))
+                result = 0;
+        }
+
+        Sleep(100L);
+        trys--;
+    }
+
+    return result;
+}

trunk/gsdl/packages/wingdbm/systems.h

@@ -100 +100 @@
 
 #ifdef MSDOS
-#define UNLOCK_FILE(dbf)    /* later !!!  */
-#define READLOCK_FILE(dbf)  lock_val = 0;
-#define WRITELOCK_FILE(dbf) lock_val = 0;
+#define MY_UNLOCK    0
+#define MY_READLOCK  1
+#define MY_WRITELOCK 2
+int my_locking(int fh, int lmode, long lockoffset, long nbytes);
+
+#define UNLOCK_FILE(dbf)    my_locking(dbf->desc,MY_UNLOCK,0,10)
+#define READLOCK_FILE(dbf)  lock_val=my_locking(dbf->desc,MY_READLOCK,0,10)
+#define WRITELOCK_FILE(dbf) lock_val=my_locking(dbf->desc,MY_WRITELOCK,0,10)
+
 #else
 /* Assume it is done like System V. */
@@ -173 +179 @@
 typedef long word_t;
 #endif
+
+
+#include <io.h>
+
+#ifdef __GNUC__
+#define alloca __builtin_alloca
+#else /* not __GNUC__ */
+#if defined (HAVE_ALLOCA_H) || (defined(sparc) && (defined(sun) || (!defined(USG) && !defined(SVR4) && !defined(__svr4__))))
+#include <alloca.h>
+#else
+#ifndef _AIX
+char *alloca ();
+#endif
+#endif /* alloca.h */
+#endif /* not __GNUC__ */