X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flocksrv.c;h=0e391fadbe6711a74c6ecb4e658480a1bcbf21bc;hb=4495fac3b7f760814dd3b41d0f64e5077193eeee;hp=535af275ab56368de390547b2d0de663540d3726;hpb=77006d65669383febd8cd4d1541278723c578564;p=idzebra-moved-to-github.git

diff --git a/index/locksrv.c b/index/locksrv.c
index 535af27..0e391fa 100644
--- a/index/locksrv.c
+++ b/index/locksrv.c
@@ -4,7 +4,12 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: locksrv.c,v $
- * Revision 1.2  1995-12-08 16:22:55  adam
+ * 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.
@@ -16,7 +21,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
@@ -57,12 +61,12 @@ int zebraServerLock (int commitPhase)
     if (commitPhase)
     {
         logf (LOG_LOG, "Server locks org");
-        flock (server_lock_org, LOCK_SH);
+        zebraLock (server_lock_org, 0);
     }
     else
     {
         logf (LOG_LOG, "Server locks cmt");
-        flock (server_lock_cmt, LOCK_SH);
+        zebraLock (server_lock_cmt, 0);
     }
     return 0;
 }
@@ -74,12 +78,12 @@ void zebraServerUnlock (int commitPhase)
     if (commitPhase)
     {
         logf (LOG_LOG, "Server unlocks org");
-        flock (server_lock_org, LOCK_UN);
+        zebraUnlock (server_lock_org);
     }
     else
     {
         logf (LOG_LOG, "Server unlocks cmt");
-        flock (server_lock_cmt, LOCK_UN);
+        zebraUnlock (server_lock_cmt);
     }
 }