X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=0c0435cce712619666e3ff62dbd995ec96d4f06f;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=620ffcf61c0d75c8d94d0ccb7db7ccc0362bc7ce;hpb=4e2fc80e64f3d7895a871ea5b08aa80045a59f2c;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 620ffcf..0c0435c 100644
--- a/index/index.h
+++ b/index/index.h
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: index.h,v $
- * Revision 1.32  1995-12-07 17:38:46  adam
+ * Revision 1.34  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.33  1995/12/08  16:22:53  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.32  1995/12/07  17:38:46  adam
  * Work locking mechanisms for concurrent updates/commit.
  *
  * Revision 1.31  1995/12/06  12:41:22  adam
@@ -205,13 +215,16 @@ void rec_prstat (void);
 
 void zebraLockPrefix (char *pathPrefix);
 
-int zebraServerLock (void);
-void zebraServerUnlock (void);
-
 void zebraIndexLockMsg (const char *str);
-void zebraIndexUnlock (int rw);
-void zebraIndexLock (int rw);
-void zebraIndexLockCommit (void);
-int zebraServerLockGetState (void);
-
-#define FNAME_MAIN_LOCK "zebra.lock"
+void zebraIndexUnlock (void);
+void zebraIndexLock (int commitNow);
+int zebraIndexWait (int commitPhase);
+
+#define FNAME_MAIN_LOCK   "zebraidx.LCK"
+#define FNAME_COMMIT_LOCK "zebracmt.LCK"
+#define FNAME_ORG_LOCK    "zebraorg.LCK"
+#define FNAME_TOUCH_TIME  "zebraidx.time"
+
+int zebraLock (int fd, int wr);
+int zebraLockNB (int fd, int wr);
+int zebraUnlock (int fd);