X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flocksrv.c;h=2b17ba0fdff8b81ead9506e6453897bb298b2af4;hb=067b55382bc9916b3f7dcd473512c703d4de4a5d;hp=535af275ab56368de390547b2d0de663540d3726;hpb=bf27228e5485151ee52bfd87dd91b025544ab6b2;p=idzebra-moved-to-github.git

diff --git a/index/locksrv.c b/index/locksrv.c
index 535af27..2b17ba0 100644
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -1,10 +1,37 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1997, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: locksrv.c,v $
- * Revision 1.2  1995-12-08 16:22:55  adam
+ * 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.
@@ -15,40 +42,61 @@
  */
 #include <stdio.h>
 #include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
 #include <unistd.h>
-#include <sys/file.h>
+#endif
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 
-#include <alexutil.h>
 #include "zserver.h"
 
-static int server_lock_cmt = -1;
-static int server_lock_org = -1;
+int zebra_server_lock_init (ZServerInfo *zi)
+{
+    char path_prefix[1024];
+
+    assert (zi->res);
+    zi->server_lock_cmt = NULL;
+    zi->server_lock_org = NULL;
+
+    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 (int commitPhase)
+    logf (LOG_DEBUG, "Locking system initialized");
+    return 0;
+}
+
+int zebra_server_lock_destroy (ZServerInfo *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;
+}
 
-    if (server_lock_cmt == -1)
+int zebra_server_lock (ZServerInfo *zi, int commitPhase)
+{
+    if (!zi->server_lock_cmt)
     {
-        sprintf (path, "%s%s", FNAME_COMMIT_LOCK, pathPrefix);
-        if ((server_lock_cmt = open (path, O_CREAT|O_RDWR, 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;
         }
-        assert (server_lock_org == -1);
+        assert (zi->server_lock_org == NULL);
 
-        sprintf (path, "%s%s", FNAME_ORG_LOCK, pathPrefix);
-        if ((server_lock_org = open (path, O_CREAT|O_RDWR, 0666))
-            == -1)
+	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;
@@ -56,51 +104,50 @@ int zebraServerLock (int commitPhase)
     }
     if (commitPhase)
     {
-        logf (LOG_LOG, "Server locks org");
-        flock (server_lock_org, LOCK_SH);
+        logf (LOG_DEBUG, "Server locks org");
+        zebra_lock (zi->server_lock_org);
     }
     else
     {
-        logf (LOG_LOG, "Server locks cmt");
-        flock (server_lock_cmt, LOCK_SH);
+        logf (LOG_DEBUG, "Server locks cmt");
+        zebra_lock (zi->server_lock_cmt);
     }
     return 0;
 }
 
-void zebraServerUnlock (int commitPhase)
+void zebra_server_unlock (ZServerInfo *zi, int commitPhase)
 {
-    if (server_lock_org == -1)
+    if (zi->server_lock_org == NULL)
         return;
     if (commitPhase)
     {
-        logf (LOG_LOG, "Server unlocks org");
-        flock (server_lock_org, LOCK_UN);
+        logf (LOG_DEBUG, "Server unlocks org");
+        zebra_unlock (zi->server_lock_org);
     }
     else
     {
-        logf (LOG_LOG, "Server unlocks cmt");
-        flock (server_lock_cmt, LOCK_UN);
+        logf (LOG_DEBUG, "Server unlocks cmt");
+        zebra_unlock (zi->server_lock_cmt);
     }
 }
 
-int zebraServerLockGetState (time_t *timep)
+int zebra_server_lock_get_state (ZServerInfo *zi, time_t *timep)
 {
-    char pathPrefix[1024];
     char path[1024];
     char buf[256];
     int fd;
     struct stat xstat;
     
-    zebraLockPrefix (pathPrefix);
-
-    sprintf (path, "%s%s", pathPrefix, FNAME_TOUCH_TIME);
+    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;