X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockidx.c;h=f2c418ccf88ac93533922fe9fa942d3f2a4815a5;hb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;hp=eb833b255f4821ede18348e2f84bf623545b95f2;hpb=7e3b091d6944a2ef10f1c6e983181be53b565e34;p=idzebra-moved-to-github.git

diff --git a/index/lockidx.c b/index/lockidx.c
index eb833b2..f2c418c 100644
--- a/index/lockidx.c
+++ b/index/lockidx.c
@@ -4,7 +4,27 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockidx.c,v $
- * Revision 1.4  1995-12-12 16:00:57  adam
+ * Revision 1.10  1997-09-09 13:38:07  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.9  1997/09/04 13:58:04  adam
+ * Added O_BINARY for open calls.
+ *
+ * Revision 1.8  1997/02/12 20:39:46  adam
+ * Implemented options -f <n> that limits the log to the first <n>
+ * records.
+ * Changed some log messages also.
+ *
+ * Revision 1.7  1996/10/29 14:08:13  adam
+ * Uses resource lockDir instead of lockPath.
+ *
+ * Revision 1.6  1996/03/26 16:01:13  adam
+ * New setting lockPath: directory of various lock files.
+ *
+ * Revision 1.5  1995/12/13  08:46:09  adam
+ * Locking uses F_WRLCK and F_RDLCK again!
+ *
+ * Revision 1.4  1995/12/12  16:00:57  adam
  * System call sync(2) used after update/commit.
  * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
  * and F_RDLCK.
@@ -25,12 +45,15 @@
  */
 #include <stdio.h>
 #include <assert.h>
+#ifdef WINDOWS
+#include <io.h>
+#else
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 
-#include <alexutil.h>
 #include "index.h"
 
 static int lock_fd = -1;
@@ -47,8 +70,9 @@ int zebraIndexWait (int commitPhase)
 
     if (server_lock_cmt == -1)
     {
-        sprintf (path, "%s%s", FNAME_COMMIT_LOCK, pathPrefix);
-        if ((server_lock_cmt = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
+        sprintf (path, "%s%s", pathPrefix, FNAME_COMMIT_LOCK);
+        if ((server_lock_cmt = open (path, O_BINARY|O_CREAT|O_RDWR|O_SYNC,
+                                     0666))
             == -1)
         {
             logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
@@ -59,8 +83,9 @@ int zebraIndexWait (int commitPhase)
         zebraUnlock (server_lock_cmt);
     if (server_lock_org == -1)
     {
-        sprintf (path, "%s%s", FNAME_ORG_LOCK, pathPrefix);
-        if ((server_lock_org = open (path, O_CREAT|O_RDWR|O_SYNC, 0666))
+        sprintf (path, "%s%s", pathPrefix, FNAME_ORG_LOCK);
+        if ((server_lock_org = open (path, O_BINARY|O_CREAT|O_RDWR|O_SYNC,
+                                     0666))
             == -1)
         {
             logf (LOG_FATAL|LOG_ERRNO, "create %s", path);
@@ -139,10 +164,10 @@ void zebraIndexLock (int commitNow)
     sprintf (path, "%s%s", pathPrefix, FNAME_MAIN_LOCK);
     while (1)
     {
-        lock_fd = open (path, O_CREAT|O_RDWR|O_EXCL, 0666);
+        lock_fd = open (path, O_BINARY|O_CREAT|O_RDWR|O_EXCL, 0666);
         if (lock_fd == -1)
         {
-            lock_fd = open (path, O_RDONLY);
+            lock_fd = open (path, O_BINARY|O_RDWR);
             if (lock_fd == -1) 
             {
                 if (errno == ENOENT)
@@ -154,8 +179,10 @@ void zebraIndexLock (int commitNow)
             {
                 if (errno == EWOULDBLOCK)
                 {
-                    logf (LOG_LOG, "Waiting for other index process");
+                    logf (LOG_LOG, "waiting for other index process");
                     zebraLock (lock_fd, 1);
+                    zebraUnlock (lock_fd);
+                    close (lock_fd);
                     continue;
                 }
                 else
@@ -166,23 +193,23 @@ void zebraIndexLock (int commitNow)
             }
             else
             {
-                logf (LOG_WARN, "Unlocked %s", path);
+                logf (LOG_WARN, "unlocked %s", path);
                 r = read (lock_fd, buf, 256);
                 if (r == 0)
                 {
-                    logf (LOG_WARN, "Zero length %s", path);
+                    logf (LOG_WARN, "zero length %s", path);
                     close (lock_fd);
                     unlink (path);
                     continue;
                 }
                 else if (r == -1)
                 {
-                    logf (LOG_FATAL|LOG_ERRNO, "read  %s", path);
+                    logf (LOG_FATAL|LOG_ERRNO, "read %s", path);
                     exit (1);
                 }
                 if (*buf == 'r')
                 {
-                    logf (LOG_WARN, "Previous transaction didn't"
+                    logf (LOG_WARN, "previous transaction didn't"
                           " reach commit");
                     close (lock_fd);
                     bf_commitClean ();
@@ -191,7 +218,7 @@ void zebraIndexLock (int commitNow)
                 }
                 else if (*buf == 'd')
                 {
-                    logf (LOG_WARN, "Commit file wan't deleted after commit");
+                    logf (LOG_WARN, "commit file wan't deleted after commit");
                     close (lock_fd);
                     bf_commitClean ();
                     unlink (path);
@@ -199,7 +226,7 @@ void zebraIndexLock (int commitNow)
                 }                    
                 else if (*buf == 'w')
                 {
-                    logf (LOG_WARN, "Your index may be inconsistent");
+                    logf (LOG_WARN, "your index may be inconsistent");
                     exit (1);
                 }
                 else if (*buf == 'c')
@@ -210,13 +237,13 @@ void zebraIndexLock (int commitNow)
                         close (lock_fd);
                         continue;
                     }
-                    logf (LOG_FATAL, "Previous transaction didn't"
+                    logf (LOG_FATAL, "previous transaction didn't"
                           " finish commit. Commit now!");
                     exit (1);
                 }
                 else 
                 {
-                    logf (LOG_FATAL, "Unknown id 0x%02x in %s", *buf,
+                    logf (LOG_FATAL, "unknown id 0x%02x in %s", *buf,
                           path);
                     exit (1);
                 }