X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flocksrv.c;h=7591349f3e10ae5bbb07c8715641f796a6d691d6;hb=bceca936710690858ea162e7bc22de819f0e280f;hp=517e6809238d5f9d82c095ffecd1b9129df7b131;hpb=4e2fc80e64f3d7895a871ea5b08aa80045a59f2c;p=idzebra-moved-to-github.git diff --git a/index/locksrv.c b/index/locksrv.c index 517e680..7591349 100644 --- a/index/locksrv.c +++ b/index/locksrv.c @@ -1,95 +1,170 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: locksrv.c,v $ - * Revision 1.1 1995-12-07 17:38:47 adam + * Revision 1.12 1999-02-02 14:50:58 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.11 1998/03/05 08:45:12 adam + * New result set model and modular ranking system. Moved towards + * descent server API. System information stored as "SGML" records. + * + * Revision 1.10 1997/09/29 09:08:36 adam + * Revised locking system to be thread safe for the server. + * + * Revision 1.9 1997/09/25 14:54:43 adam + * WIN32 files lock support. + * + * 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/04 13:58:04 adam + * Added O_BINARY for open calls. + * + * Revision 1.6 1996/10/29 14:06:52 adam + * Include zebrautl.h instead of alexutil.h. + * + * Revision 1.5 1996/05/15 11:58:18 adam + * Changed some log messages. + * + * Revision 1.4 1996/04/10 16:01:27 quinn + * Fixed order of path/filename. + * + * 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:55 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. + * + * Revision 1.1 1995/12/07 17:38:47 adam * Work locking mechanisms for concurrent updates/commit. * */ #include #include +#ifdef WIN32 +#include +#else #include -#include +#endif +#include #include #include #include -#include -#include "index.h" +#include "zserver.h" + +int zebra_server_lock_init (ZebraHandle zi) +{ + char path_prefix[1024]; + + assert (zi->res); + zi->server_lock_cmt = NULL; + zi->server_lock_org = NULL; -static int server_lock_fd = -1; + zebra_lock_prefix (zi->res, path_prefix); + zi->server_path_prefix = xmalloc (strlen(path_prefix)+1); + strcpy (zi->server_path_prefix, path_prefix); -int zebraServerLock (void) + logf (LOG_DEBUG, "Locking system initialized"); + return 0; +} + +int zebra_server_lock_destroy (ZebraHandle zi) { - char pathPrefix[1024]; - char path[1024]; - - zebraLockPrefix (pathPrefix); + xfree (zi->server_path_prefix); + zebra_lock_destroy (zi->server_lock_cmt); + zebra_lock_destroy (zi->server_lock_org); + logf (LOG_DEBUG, "Locking system destroyed"); + return 0; +} - assert (server_lock_fd == -1); - sprintf (path, "%szebrasrv.%ld", pathPrefix, (long) getpid()); - if ((server_lock_fd = open (path, O_CREAT|O_RDWR|O_SYNC|O_EXCL, 0666)) - == -1) +int zebra_server_lock (ZebraHandle zi, int commitPhase) +{ + if (!zi->server_lock_cmt) { - logf (LOG_WARN|LOG_ERRNO, "remove stale %s", path); - unlink (path); - if ((server_lock_fd = open (path, O_CREAT|O_RDWR|O_SYNC|O_EXCL, 0666)) - == -1) + char path[1024]; + + strcpy (path, zi->server_path_prefix); + strcat (path, FNAME_COMMIT_LOCK); + if (!(zi->server_lock_cmt = zebra_lock_create (path, 0))) { logf (LOG_FATAL|LOG_ERRNO, "create %s", path); return -1; } - } - flock (server_lock_fd, LOCK_EX); + assert (zi->server_lock_org == NULL); + strcpy (path, zi->server_path_prefix); + strcat (path, FNAME_ORG_LOCK); + if (!(zi->server_lock_org = zebra_lock_create (path, 0))) + { + logf (LOG_FATAL|LOG_ERRNO, "create %s", path); + return -1; + } + } + if (commitPhase) + { + logf (LOG_DEBUG, "Server locks org"); + zebra_lock (zi->server_lock_org); + } + else + { + logf (LOG_DEBUG, "Server locks cmt"); + zebra_lock (zi->server_lock_cmt); + } return 0; } -int zebraServerLockGetState (void) +void zebra_server_unlock (ZebraHandle zi, int commitPhase) +{ + if (zi->server_lock_org == NULL) + return; + if (commitPhase) + { + logf (LOG_DEBUG, "Server unlocks org"); + zebra_unlock (zi->server_lock_org); + } + else + { + logf (LOG_DEBUG, "Server unlocks cmt"); + zebra_unlock (zi->server_lock_cmt); + } +} + +int zebra_server_lock_get_state (ZebraHandle zi, time_t *timep) { - char pathPrefix[1024]; char path[1024]; char buf[256]; int fd; + struct stat xstat; - zebraLockPrefix (pathPrefix); + strcpy (path, zi->server_path_prefix); + strcat (path, FNAME_TOUCH_TIME); + if (stat (path, &xstat) == -1) + *timep = 1; + else + *timep = xstat.st_ctime; - sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK); - fd = open (path, O_RDONLY); + strcpy (path, zi->server_path_prefix); + strcat (path, FNAME_MAIN_LOCK); + fd = open (path, O_BINARY|O_RDONLY); if (fd == -1) + { + *buf = 0; return 0; + } if (read (fd, buf, 2) == 0) + { + *buf = 0; return 0; + } close (fd); return *buf; } - -void zebraServerLockMsg (const char *str) -{ - int l, r; - - assert (server_lock_fd != -1); - lseek (server_lock_fd, 0L, SEEK_SET); - l = strlen(str); - r = write (server_lock_fd, str, l); - if (r != l) - { - logf (LOG_FATAL|LOG_ERRNO, "write server lock file"); - exit (1); - } -} - -void zebraServerUnlock (void) -{ - char pathPrefix[1024]; - char path[1024]; - - assert (server_lock_fd != -1); - zebraLockPrefix (pathPrefix); - flock (server_lock_fd, LOCK_UN); - sprintf (path, "%szebrasrv.%ld", pathPrefix, (long) getpid()); - unlink (path); -} -