/*
- * Copyright (C) 1994-1995, Index Data I/S
+ * Copyright (C) 1994-2002, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: lockutil.c,v $
- * Revision 1.8 1997-09-17 12:19:15 adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.7 1997/09/09 13:38:08 adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.6 1996/10/29 14:08:14 adam
- * Uses resource lockDir instead of lockPath.
- *
- * Revision 1.5 1996/03/26 16:01:13 adam
- * New setting lockPath: directory of various lock files.
- *
- * Revision 1.4 1995/12/13 08:46:10 adam
- * Locking uses F_WRLCK and F_RDLCK again!
- *
- * Revision 1.3 1995/12/12 16:00:57 adam
- * System call sync(2) used after update/commit.
- * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
- * and F_RDLCK.
- *
- * Revision 1.2 1995/12/11 11:43:29 adam
- * Locking based on fcntl instead of flock.
- * Setting commitEnable removed. Command line option -n can be used to
- * prevent commit if commit setting is defined in the configuration file.
- *
- * Revision 1.1 1995/12/07 17:38:47 adam
- * Work locking mechanisms for concurrent updates/commit.
- *
+ * $Id: lockutil.c,v 1.15 2002-04-04 14:14:13 adam Exp $
*/
#include <stdio.h>
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/types.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
+#include <sys/locking.h>
#else
#include <unistd.h>
#endif
#include "index.h"
-static char *lockDir = NULL;
+struct zebra_lock_info {
+ int fd;
+ int excl_flag;
+};
+
+char *zebra_mk_fname (const char *dir, const char *name)
+{
+ int dlen = dir ? strlen(dir) : 0;
+ char *fname = xmalloc (dlen + strlen(name) + 3);
+
+#ifdef WIN32
+ if (dlen)
+ {
+ int last_one = dir[dlen-1];
-void zebraLockPrefix (Res res, char *pathPrefix)
+ if (!strchr ("/\\:", last_one))
+ sprintf (fname, "%s\\%s", dir, name);
+ else
+ sprintf (fname, "%s%s", dir, name);
+ }
+ else
+ sprintf (fname, "%s", name);
+#else
+ if (dlen)
+ {
+ int last_one = dir[dlen-1];
+
+ if (!strchr ("/", last_one))
+ sprintf (fname, "%s/%s", dir, name);
+ else
+ sprintf (fname, "%s%s", dir, name);
+ }
+ else
+ sprintf (fname, "%s", name);
+#endif
+ return fname;
+}
+
+ZebraLockHandle zebra_lock_create (const char *dir,
+ const char *name, int excl_flag)
{
- if (!lockDir)
- lockDir = res_get_def (res, "lockDir", "");
- assert (lockDir);
+ char *fname = zebra_mk_fname(dir, name);
+ ZebraLockHandle h = (ZebraLockHandle) xmalloc (sizeof(*h));
+
+ h->excl_flag = excl_flag;
+ h->fd = -1;
+
- strcpy (pathPrefix, lockDir);
- if (*pathPrefix && pathPrefix[strlen(pathPrefix)-1] != '/')
- strcat (pathPrefix, "/");
+#ifdef WIN32
+ if (!h->excl_flag)
+ h->fd = open (name, O_BINARY|O_RDONLY);
+ if (h->fd == -1)
+ h->fd = open (fname, ((h->excl_flag > 1) ? O_EXCL : 0)|
+ (O_BINARY|O_CREAT|O_RDWR), 0666);
+#else
+ h->fd= open (fname, ((h->excl_flag > 1) ? O_EXCL : 0)|
+ (O_BINARY|O_CREAT|O_RDWR|O_SYNC), 0666);
+#endif
+ if (h->fd == -1)
+ {
+ if (h->excl_flag <= 1)
+ logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
+ xfree (h);
+ h = 0;
+ }
+ xfree (fname);
+ return h;
}
-static int intLock (int fd, int type, int cmd)
+void zebra_lock_destroy (ZebraLockHandle h)
+{
+ if (!h)
+ return;
+ if (h->fd != -1)
+ close (h->fd);
+ xfree (h);
+}
+
+void zebra_lock_prefix (Res res, char *path)
+{
+ char *lock_dir = res_get_def (res, "lockDir", "");
+
+ strcpy (path, lock_dir);
+ if (*path && path[strlen(path)-1] != '/')
+ strcat (path, "/");
+}
+
+#ifndef WIN32
+static int unixLock (int fd, int type, int cmd)
{
struct flock area;
area.l_type = type;
area.l_len = area.l_start = 0L;
return fcntl (fd, cmd, &area);
}
+#endif
+
+int zebra_lock_w (ZebraLockHandle h)
+{
+#ifdef WIN32
+ return _locking (h->fd, _LK_LOCK, 1);
+#else
+ return unixLock (h->fd, F_WRLCK, F_SETLKW);
+#endif
+}
+
+int zebra_lock_r (ZebraLockHandle h)
+{
+#ifdef WIN32
+ return _locking (h->fd, _LK_LOCK, 1);
+#else
+ return unixLock (h->fd, F_RDLCK, F_SETLKW);
+#endif
+}
+
+int zebra_lock (ZebraLockHandle h)
+{
+#ifdef WIN32
+ return _locking (h->fd, _LK_LOCK, 1);
+#else
+ return unixLock (h->fd, h->excl_flag ? F_WRLCK : F_RDLCK, F_SETLKW);
+#endif
+}
-int zebraLock (int fd, int wr)
+int zebra_lock_nb (ZebraLockHandle h)
{
-#if 0
- return intLock (fd, wr ? F_EXLCK : F_SHLCK, F_SETLKW);
+#ifdef WIN32
+ return _locking (h->fd, _LK_NBLCK, 1);
#else
- return intLock (fd, wr ? F_WRLCK : F_RDLCK, F_SETLKW);
+ return unixLock (h->fd, h->excl_flag ? F_WRLCK : F_RDLCK, F_SETLK);
#endif
}
-int zebraLockNB (int fd, int wr)
+int zebra_unlock (ZebraLockHandle h)
{
-#if 0
- return intLock (fd, wr ? F_EXLCK : F_SHLCK, F_SETLK);
+#ifdef WIN32
+ return _locking (h->fd, _LK_UNLCK, 1);
#else
- return intLock (fd, wr ? F_WRLCK : F_RDLCK, F_SETLK);
+ return unixLock (h->fd, F_UNLCK, F_SETLKW);
#endif
}
-int zebraUnlock (int fd)
+int zebra_lock_fd (ZebraLockHandle h)
{
- return intLock (fd, F_UNLCK, F_SETLKW);
+ return h->fd;
}