X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Flocksrv.c;h=304dc88a2c936264f6ce646edf7b5fb630ecb3ae;hb=c5ef994b26d692fbfecc3ac97f69e4bf7bd0fcea;hp=517e6809238d5f9d82c095ffecd1b9129df7b131;hpb=4e2fc80e64f3d7895a871ea5b08aa80045a59f2c;p=idzebra-moved-to-github.git

diff --git a/index/locksrv.c b/index/locksrv.c
index 517e680..304dc88 100644
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -1,95 +1,140 @@
 /*
- * 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.1  1995-12-07 17:38:47  adam
+ * 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 <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 "index.h"
+#include "zserver.h"
 
-static int server_lock_fd = -1;
+static ZebraLockHandle server_lock_cmt = NULL;
+static ZebraLockHandle server_lock_org = NULL;
 
-int zebraServerLock (void)
+int zebraServerLock (Res res, int commitPhase)
 {
     char pathPrefix[1024];
     char path[1024];
     
-    zebraLockPrefix (pathPrefix);
+    zebraLockPrefix (res, pathPrefix);
 
-    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)
+    if (!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)
+        sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK);
+        if (!(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 (server_lock_org == NULL);
 
+        sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK);
+        if (!(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 (server_lock_org);
+    }
+    else
+    {
+        logf (LOG_DEBUG, "Server locks cmt");
+        zebra_lock (server_lock_cmt);
+    }
     return 0;
 }
 
-int zebraServerLockGetState (void)
+void zebraServerUnlock (int commitPhase)
+{
+    if (server_lock_org == NULL)
+        return;
+    if (commitPhase)
+    {
+        logf (LOG_DEBUG, "Server unlocks org");
+        zebra_unlock (server_lock_org);
+    }
+    else
+    {
+        logf (LOG_DEBUG, "Server unlocks cmt");
+        zebra_unlock (server_lock_cmt);
+    }
+}
+
+int zebraServerLockGetState (Res res, time_t *timep)
 {
     char pathPrefix[1024];
     char path[1024];
     char buf[256];
     int fd;
+    struct stat xstat;
     
-    zebraLockPrefix (pathPrefix);
+    zebraLockPrefix (res, pathPrefix);
 
+    sprintf (path, "%s%s", pathPrefix, 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);
+    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);
-}
-