* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lockidx.c,v $
- * Revision 1.4 1995-12-12 16:00:57 adam
+ * Revision 1.7 1996-10-29 14:08:13 adam
+ * Uses resource lockDir instead of lockPath.
+ *
+ * Revision 1.6 1996/03/26 16:01:13 adam
+ * New setting lockPath: directory of various lock files.
+ *
+ * Revision 1.5 1995/12/13 08:46:09 adam
+ * Locking uses F_WRLCK and F_RDLCK again!
+ *
+ * Revision 1.4 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.
#include <string.h>
#include <errno.h>
-#include <alexutil.h>
#include "index.h"
static int lock_fd = -1;
if (server_lock_cmt == -1)
{
- sprintf (path, "%s%s", FNAME_COMMIT_LOCK, pathPrefix);
+ sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK);
if ((server_lock_cmt = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
== -1)
{
zebraUnlock (server_lock_cmt);
if (server_lock_org == -1)
{
- sprintf (path, "%s%s", FNAME_ORG_LOCK, pathPrefix);
+ sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK);
if ((server_lock_org = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
== -1)
{
lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL, 0666);
if (lock_fd == -1)
{
- lock_fd = open (path, O_RDONLY);
+ lock_fd = open (path, O_RDWR);
if (lock_fd == -1)
{
if (errno == ENOENT)
logf (LOG_FATAL|LOG_ERRNO, "open %s", path);
exit (1);
}
+ logf (LOG_LOG, "zebraLockNB");
if (zebraLockNB (lock_fd, 1) == -1)
{
if (errno == EWOULDBLOCK)
{
logf (LOG_LOG, "Waiting for other index process");
zebraLock (lock_fd, 1);
+ zebraUnlock (lock_fd);
+ close (lock_fd);
continue;
}
else
}
else if (r == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "read %s", path);
+ logf (LOG_FATAL|LOG_ERRNO, "read %s", path);
exit (1);
}
if (*buf == 'r')