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

diff --git a/index/locksrv.c b/index/locksrv.c
index 517e680..ac79e27 100644
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -1,95 +1,137 @@
-/*
- * Copyright (C) 1994-1995, 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
- * Work locking mechanisms for concurrent updates/commit.
- *
- */
+/* $Id: locksrv.c,v 1.17 2002-08-02 19:26:55 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 #include <stdio.h>
 #include <assert.h>
+#ifdef WIN32
+#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;
+int zebra_server_lock_init (ZebraService zi)
+{
+    char path_prefix[1024];
+
+    zi->server_lock_cmt = NULL;
+    zi->server_lock_org = NULL;
+
+    zebra_lock_prefix (zi->res, path_prefix);
+    zi->server_path_prefix = (char *) xmalloc (strlen(path_prefix)+1);
+    strcpy (zi->server_path_prefix, path_prefix);
+
+    logf (LOG_DEBUG, "Locking system initialized");
+    return 0;
+}
 
-int zebraServerLock (void)
+int zebra_server_lock_destroy (ZebraService 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 (ZebraService 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 (ZebraService zi, int commitPhase)
+{
+    if (zi->server_lock_org == NULL)
+        return;
+    logf (LOG_DEBUG, "Server unlocks org");
+    zebra_unlock (zi->server_lock_org);
+    logf (LOG_DEBUG, "Server unlocks cmt");
+    zebra_unlock (zi->server_lock_cmt);
+}
+
+int zebra_server_lock_get_state (ZebraService 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_mtime;
 
-    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);
-}
-