Work on update while servers are running. Three lock files introduced.

[idzebra-moved-to-github.git] / index / locksrv.c

diff --git a/index/locksrv.c b/index/locksrv.c
index 517e680..535af27 100644 (file)
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -4,7 +4,12 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: locksrv.c,v $
- * Revision 1.1  1995-12-07 17:38:47  adam
+ * 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.
  *
  */
@@ -12,84 +17,100 @@
 #include <assert.h>
 #include <unistd.h>
 #include <sys/file.h>
+#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 int server_lock_cmt = -1;
+static int server_lock_org = -1;
 
-int zebraServerLock (void)
+int zebraServerLock (int commitPhase)
 {
     char pathPrefix[1024];
     char path[1024];
     
     zebraLockPrefix (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 == -1)
     {
-        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))
+        sprintf (path, "%s%s", FNAME_COMMIT_LOCK, pathPrefix);
+        if ((server_lock_cmt = open (path, O_CREAT|O_RDWR, 0666))
             == -1)
         {
             logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
             return -1;
         }
-    }
-    flock (server_lock_fd, LOCK_EX);
+        assert (server_lock_org == -1);
 
+        sprintf (path, "%s%s", FNAME_ORG_LOCK, pathPrefix);
+        if ((server_lock_org = open (path, O_CREAT|O_RDWR, 0666))
+            == -1)
+        {
+            logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
+            return -1;
+        }
+    }
+    if (commitPhase)
+    {
+        logf (LOG_LOG, "Server locks org");
+        flock (server_lock_org, LOCK_SH);
+    }
+    else
+    {
+        logf (LOG_LOG, "Server locks cmt");
+        flock (server_lock_cmt, LOCK_SH);
+    }
     return 0;
 }
 
-int zebraServerLockGetState (void)
+void zebraServerUnlock (int commitPhase)
+{
+    if (server_lock_org == -1)
+        return;
+    if (commitPhase)
+    {
+        logf (LOG_LOG, "Server unlocks org");
+        flock (server_lock_org, LOCK_UN);
+    }
+    else
+    {
+        logf (LOG_LOG, "Server unlocks cmt");
+        flock (server_lock_cmt, LOCK_UN);
+    }
+}
+
+int zebraServerLockGetState (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);
+    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);
     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);
-}
-