X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=9cc80c2c795d2a4342755cdfc3da53de8939ab77;hb=d6a9b756bbc67a138ecea66eff5391e0c8947ac2;hp=75bec8692107ff1f9349c670ad0d6f0556b350f5;hpb=bf27228e5485151ee52bfd87dd91b025544ab6b2;p=idzebra-moved-to-github.git diff --git a/index/lockidx.c b/index/lockidx.c index 75bec86..9cc80c2 100644 --- a/index/lockidx.c +++ b/index/lockidx.c @@ -4,7 +4,44 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: lockidx.c,v $ - * Revision 1.2 1995-12-08 16:22:54 adam + * Revision 1.12 1997-09-25 14:54:43 adam + * WIN32 files lock support. + * + * Revision 1.11 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.10 1997/09/09 13:38:07 adam + * Partial port to WIN95/NT. + * + * Revision 1.9 1997/09/04 13:58:04 adam + * Added O_BINARY for open calls. + * + * Revision 1.8 1997/02/12 20:39:46 adam + * Implemented options -f that limits the log to the first + * records. + * Changed some log messages also. + * + * 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. + * + * Revision 1.3 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.2 1995/12/08 16:22:54 adam * Work on update while servers are running. Three lock files introduced. * The servers reload their registers when necessary, but they don't * reestablish result sets yet. @@ -15,73 +52,77 @@ */ #include #include +#ifdef WINDOWS +#include +#else #include -#include +#endif #include #include #include -#include #include "index.h" -static int lock_fd = -1; -static int server_lock_cmt = -1; -static int server_lock_org = -1; +static ZebraLockHandle server_lock_main = NULL; +static ZebraLockHandle server_lock_cmt = NULL; +static ZebraLockHandle server_lock_org = NULL; int zebraIndexWait (int commitPhase) { char pathPrefix[1024]; char path[1024]; - int fd; + ZebraLockHandle h; - zebraLockPrefix (pathPrefix); + zebraLockPrefix (common_resource, pathPrefix); - if (server_lock_cmt == -1) + if (server_lock_cmt) + zebra_unlock (server_lock_cmt); + else { - sprintf (path, "%s%s", FNAME_COMMIT_LOCK, pathPrefix); - if ((server_lock_cmt = open (path, O_CREAT|O_RDWR|O_SYNC, 0666)) - == -1) - { - logf (LOG_FATAL|LOG_ERRNO, "create %s", path); - return -1; - } + sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK); + server_lock_cmt = zebra_lock_create (path, 1); + if (!server_lock_cmt) + { + logf (LOG_WARN|LOG_ERRNO, "cannot create lock %s", path); + return -1; + } } + if (server_lock_org) + zebra_unlock (server_lock_org); else - flock (server_lock_cmt, LOCK_UN); - if (server_lock_org == -1) { - sprintf (path, "%s%s", FNAME_ORG_LOCK, pathPrefix); - if ((server_lock_org = open (path, O_CREAT|O_RDWR|O_SYNC, 0666)) - == -1) - { - logf (LOG_FATAL|LOG_ERRNO, "create %s", path); - return -1; - } + sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK); + server_lock_org = zebra_lock_create (path, 1); + if (!server_lock_org) + { + logf (LOG_WARN|LOG_ERRNO, "cannot create lock %s", path); + return -1; + } } - else - flock (server_lock_org, LOCK_UN); if (commitPhase) - fd = server_lock_cmt; + h = server_lock_cmt; else - fd = server_lock_org; - if (flock (fd, LOCK_EX|LOCK_NB) == -1) + h = server_lock_org; + if (zebra_lock_nb (h)) { +#ifndef WINDOWS if (errno != EWOULDBLOCK) { logf (LOG_FATAL|LOG_ERRNO, "flock"); exit (1); } +#endif if (commitPhase) logf (LOG_LOG, "Waiting for lock cmt"); else logf (LOG_LOG, "Waiting for lock org"); - if (flock (fd, LOCK_EX) == -1) + if (zebra_lock (h) == -1) { - logf (LOG_FATAL|LOG_ERRNO, "flock"); + logf (LOG_FATAL, "flock"); exit (1); } } - flock (fd, LOCK_UN); + zebra_unlock (h); return 0; } @@ -92,16 +133,17 @@ void zebraIndexLockMsg (const char *str) char pathPrefix[1024]; int l, r, fd; - assert (lock_fd != -1); - lseek (lock_fd, 0L, SEEK_SET); + assert (server_lock_main); + fd = zebra_lock_fd (server_lock_main); + lseek (fd, 0L, SEEK_SET); l = strlen(str); - r = write (lock_fd, str, l); + r = write (fd, str, l); if (r != l) { logf (LOG_FATAL|LOG_ERRNO, "write lock file"); exit (1); } - zebraLockPrefix (pathPrefix); + zebraLockPrefix (common_resource, pathPrefix); sprintf (path, "%s%s", pathPrefix, FNAME_TOUCH_TIME); fd = creat (path, 0666); close (fd); @@ -112,35 +154,50 @@ void zebraIndexUnlock (void) char path[1024]; char pathPrefix[1024]; - zebraLockPrefix (pathPrefix); + zebraLockPrefix (common_resource, pathPrefix); sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK); unlink (path); } -void zebraIndexLock (int commitNow) +void zebraIndexLock (BFiles bfs, int commitNow, const char *rval) { char path[1024]; char pathPrefix[1024]; char buf[256]; int r; - if (lock_fd != -1) + if (server_lock_main) return ; - zebraLockPrefix (pathPrefix); + zebraLockPrefix (common_resource, pathPrefix); sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK); while (1) { - lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL|O_SYNC, 0666); - if (lock_fd == -1) + server_lock_main = zebra_lock_create (path, 2); + if (!server_lock_main) { - lock_fd = open (path, O_RDONLY); - assert (lock_fd != -1); - if (flock (lock_fd, LOCK_EX|LOCK_NB) == -1) + server_lock_main = zebra_lock_create (path, 1); + if (!server_lock_main) { + if (errno == ENOENT) + continue; + logf (LOG_FATAL|LOG_ERRNO, "open %s", path); + exit (1); + } + if (zebra_lock_nb (server_lock_main) == -1) + { +#ifdef WINDOWS + logf (LOG_LOG, "waiting for other index process"); + zebra_lock (server_lock_main); + zebra_unlock (server_lock_main); + zebra_lock_destroy (server_lock_main); + continue; +#else if (errno == EWOULDBLOCK) { - logf (LOG_LOG, "Waiting for other index process"); - flock (lock_fd, LOCK_EX); + logf (LOG_LOG, "waiting for other index process"); + zebra_lock (server_lock_main); + zebra_unlock (server_lock_main); + zebra_lock_destroy (server_lock_main); continue; } else @@ -148,43 +205,46 @@ void zebraIndexLock (int commitNow) logf (LOG_FATAL|LOG_ERRNO, "flock %s", path); exit (1); } +#endif } else { - logf (LOG_WARN, "Unlocked %s", path); - r = read (lock_fd, buf, 256); + int fd = zebra_lock_fd (server_lock_main); + + logf (LOG_WARN, "unlocked %s", path); + r = read (fd, buf, 256); if (r == 0) { - logf (LOG_WARN, "Zero length %s", path); - close (lock_fd); - unlink (path); + logf (LOG_WARN, "zero length %s", path); + zebra_lock_destroy (server_lock_main); + unlink (path); continue; } 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') { - logf (LOG_WARN, "Previous transaction didn't" + logf (LOG_WARN, "previous transaction didn't" " reach commit"); - close (lock_fd); - bf_commitClean (); + zebra_lock_destroy (server_lock_main); + bf_commitClean (bfs, rval); unlink (path); continue; } else if (*buf == 'd') { - logf (LOG_WARN, "Commit file wan't deleted after commit"); - close (lock_fd); - bf_commitClean (); + logf (LOG_WARN, "commit file wan't deleted after commit"); + zebra_lock_destroy (server_lock_main); + bf_commitClean (bfs, rval); unlink (path); continue; } else if (*buf == 'w') { - logf (LOG_WARN, "Your index may be inconsistent"); + logf (LOG_WARN, "your index may be inconsistent"); exit (1); } else if (*buf == 'c') @@ -192,16 +252,16 @@ void zebraIndexLock (int commitNow) if (commitNow) { unlink (path); - close (lock_fd); + zebra_lock_destroy (server_lock_main); continue; } - logf (LOG_FATAL, "Previous transaction didn't" + logf (LOG_FATAL, "previous transaction didn't" " finish commit. Commit now!"); exit (1); } else { - logf (LOG_FATAL, "Unknown id 0x%02x in %s", *buf, + logf (LOG_FATAL, "unknown id 0x%02x in %s", *buf, path); exit (1); } @@ -210,6 +270,6 @@ void zebraIndexLock (int commitNow) else break; } - flock (lock_fd, LOCK_EX); + zebra_lock (server_lock_main); }