Changeset 609

Timestamp:

1999-09-21T23:36:42+12:00 (25 years ago)

Author:

sjboddie

Message:

tidied up file locking stuff

File:

• trunk/gsdl/lib/gsdlconf.h (modified) (4 diffs)

trunk/gsdl/lib/gsdlconf.h

@@ -33 +33 @@
 // Note: all macros used in the gsdl software (except the _H macros) should
 // now start with GSDL_
-
 
 // GSDL_NEED_STRINGS_H should be defined if some string functions
@@ -80 +79 @@
 
 #if defined(__WIN32__)
-#define MY_UNLOCK    0
-#define MY_READLOCK  1
-#define MY_WRITELOCK 2
-int my_locking(int fd, int lmode, long lockoffset, long nbytes);
-
-#define UNLOCK_FILE(fd)    my_locking(fd, MY_UNLOCK, 0, 10)
-#define READLOCK_FILE(fd)  lock_val = my_locking(fd, MY_READLOCK, 0, 10)
-#define WRITELOCK_FILE(fd) lock_val = my_locking(fd, MY_WRITELOCK, 0, 10)
+#include <io.h>
+#include <sys/locking.h>
+#define GSDL_GET_FILEDESC(str) str.fd()
+#define GSDL_UNLOCK_FILE(fd) _locking(fd, LK_UNLCK, 200)
+#define GSDL_LOCK_FILE(fd) lock_val = _locking(fd, LK_NBLCK, 200)
 
 #else
+#define GSDL_GET_FILEDESC(str) str.filedesc()
 
 #if GSDL_USE_FLOCK
@@ -110 +107 @@
 #endif
 
-#define UNLOCK_FILE(fd) flock (fd, LOCK_UN)
-#define READLOCK_FILE(fd) lock_val = flock (fd, LOCK_SH + LOCK_NB)
-#define WRITELOCK_FILE(fd) lock_val = flock (fd, LOCK_EX + LOCK_NB)
+#define GSDL_UNLOCK_FILE(fd) flock (fd, LOCK_UN)
+#define GSDL_LOCK_FILE(fd) lock_val = flock (fd, LOCK_EX + LOCK_NB)
 
 #else
 // use fcntl
 #include <fcntl.h>
-#define UNLOCK_FILE(fd) \
+#define GSDL_UNLOCK_FILE(fd) \
     {                   \
       struct flock flock;           \
@@ -125 +121 @@
       fcntl (fd, F_SETLK, &flock);  \
     }
-#define READLOCK_FILE(fd) \
-    {                   \
-      struct flock flock;           \
-      flock.l_type = F_RDLCK;       \
-      flock.l_whence = SEEK_SET;            \
-      flock.l_start = flock.l_len = 0L; \
-      lock_val = fcntl (fd, F_SETLK, &flock);   \
-    }
-#define WRITELOCK_FILE(fd) \
+#define GSDL_LOCK_FILE(fd) \
     {                   \
       struct flock flock;           \