Moved file locking utilities from index/lockutil.c to util/flock.c

[idzebra-moved-to-github.git] / index / index.h

diff --git a/index/index.h b/index/index.h
index 5f15228..164d195 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,4 +1,4 @@
-/* $Id: index.h,v 1.153 2005-10-28 07:25:30 adam Exp $
+/* $Id: index.h,v 1.156 2006-03-23 09:15:25 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -27,6 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 #include <idzebra/version.h>
 #include <idzebra/util.h>
+#include <idzebra/flock.h>
 #include <sortidx.h>
 
 #if HAVE_SYS_TIMES_H
@@ -141,25 +142,13 @@ void zebraIndexUnlock (ZebraHandle zh);
 int zebraIndexLock (BFiles bfs, ZebraHandle zh, int commitNow, const char *rval);
 int zebraIndexWait (ZebraHandle zh, int commitPhase);
 
+void zebra_lock_prefix (Res res, char *dst);
+
 #define FNAME_MAIN_LOCK   "zebraidx.LCK"
 #define FNAME_COMMIT_LOCK "zebracmt.LCK"
 #define FNAME_ORG_LOCK    "zebraorg.LCK"
 #define FNAME_TOUCH_TIME  "zebraidx.time"
 
-typedef struct zebra_lock_info *ZebraLockHandle;
-ZebraLockHandle zebra_lock_create(const char *dir,
-                                  const char *file, int excl_flag);
-void zebra_lock_destroy (ZebraLockHandle h);
-int zebra_lock (ZebraLockHandle h);
-int zebra_lock_nb (ZebraLockHandle h);
-int zebra_unlock (ZebraLockHandle h);
-int zebra_lock_fd (ZebraLockHandle h);
-void zebra_lock_prefix (Res res, char *dst);
-char *zebra_mk_fname (const char *dir, const char *name);
-
-int zebra_lock_w (ZebraLockHandle h);
-int zebra_lock_r (ZebraLockHandle h);
-
 void zebra_load_atts (data1_handle dh, Res res);
 
 int key_SU_decode (int *ch, const unsigned char *out);
@@ -175,6 +164,7 @@ struct encode_info {
     int prevcmd;
     int keylen; /* tells if we have an unwritten key in buf, and how long*/
     void *encode_handle;
+    void *decode_handle;
     char buf[ENCODE_BUFLEN];
 };
 
@@ -192,18 +182,7 @@ typedef struct zebra_rank_class {
     struct zebra_rank_class *next;
 } *ZebraRankClass;
 
-#define NEW_REC_KEYS 1
-
-#if NEW_REC_KEYS
 #include "reckeys.h"
-#else
-struct recKeys {
-    int buf_used;
-    int buf_max;
-    char *buf;
-    void *codec_handle;
-};
-#endif
 
 #if NATTR
 
@@ -240,14 +219,10 @@ struct zebra_register {
     int stop_flag;
     int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */
 
-#if NEW_REC_KEYS
     zebra_rec_keys_t keys;
-#else
-    struct recKeys keys;
-#endif
 
 #if NATTR
-    struct recKeys sortKeys;
+    zebra_rec_keys_t sortKeys;
 #else
     struct sortKeys sortKeys;
 #endif
@@ -487,34 +462,19 @@ off_t zebra_record_int_tell (void *fh);
 int zebra_record_int_read (void *fh, char *buf, size_t count);
 void zebra_record_int_end (void *fh, off_t offset);
 
-#if NEW_REC_KEYS
 void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys);
-#else
-void print_rec_keys(ZebraHandle zh, struct recKeys *reckeys);
-#endif
 
-#if NEW_REC_KEYS
 ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys,
                                  zebra_snippets *snippets);
-#else
-ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, struct recKeys *reckeys,
-                                 zebra_snippets *snippets);
-#endif
 ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
                                    zint sysno, zebra_snippets *snippets);
 
-#if NEW_REC_KEYS
 void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
                               int cmd, zebra_rec_keys_t reckeys,
                              zint staticrank);
-#else
-void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
-                              int cmd, struct recKeys *reckeys,
-                             zint staticrank);
-#endif
 #if NATTR
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
-                            int cmd, struct recKeys *skp);
+                            int cmd, zebra_rec_keys_t skp);
 #else
 void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
                             int cmd, struct sortKeys *skp);