X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fzserver.h;h=600c7322e78e4680b781f5e08bae58add8b9bf16;hb=e583a127856d4f363ff2ba7b4321bcc8c048edba;hp=d2874a49ea3c72dbe7235fcdc73e8553e56d0483;hpb=75a4bfb9aee40405a751320769d74fd890f2c0b4;p=idzebra-moved-to-github.git

diff --git a/index/zserver.h b/index/zserver.h
index d2874a4..600c732 100644
--- a/index/zserver.h
+++ b/index/zserver.h
@@ -1,10 +1,17 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1997, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.h,v $
- * Revision 1.23  1996-12-23 15:30:46  adam
+ * Revision 1.25  1997-09-29 09:08:36  adam
+ * Revised locking system to be thread safe for the server.
+ *
+ * Revision 1.24  1997/09/17 12:19:19  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.23  1996/12/23 15:30:46  adam
  * Work on truncation.
  * Bug fix: result sets weren't deleted after server shut down.
  *
@@ -80,6 +87,19 @@
  *
  */
 
+
+#ifndef USE_TIMES
+#ifdef __linux__
+#define USE_TIMES 1
+#else
+#define USE_TIMES 0
+#endif
+#endif
+
+#if USE_TIMES
+#include <sys/times.h>
+#endif
+
 #include <backend.h>
 #include <rset.h>
 
@@ -110,6 +130,18 @@ typedef struct {
     char *errString;
     ODR odr;
     ZebTargetInfo *zti;
+    data1_handle dh;
+    data1_attset *registered_sets;
+    BFiles bfs;
+    Res res;
+
+    ZebraLockHandle server_lock_cmt;
+    ZebraLockHandle server_lock_org;
+    char *server_path_prefix;
+#ifdef USE_TIMES
+    struct tms tms1;
+    struct tms tms2;    
+#endif
 } ZServerInfo;
 
 int rpn_search (ZServerInfo *zi, 
@@ -134,6 +166,16 @@ ZServerSetSysno *resultSetSysnoGet (ZServerInfo *zi, const char *name,
 void resultSetSysnoDel (ZServerInfo *zi, ZServerSetSysno *records, int num);
 void zlog_rpn (Z_RPNQuery *rpn);
 
-int zebraServerLock (int lockCommit);
-void zebraServerUnlock (int commitPhase);
-int zebraServerLockGetState (time_t *timep);
+int zebra_server_lock_init (ZServerInfo *zi);
+int zebra_server_lock_destroy (ZServerInfo *zi);
+int zebra_server_lock (ZServerInfo *zi, int lockCommit);
+void zebra_server_unlock (ZServerInfo *zi, int commitPhase);
+int zebra_server_lock_get_state (ZServerInfo *zi, time_t *timep);
+
+typedef struct attent
+{
+    int attset_ordinal;
+    data1_local_attribute *local_attributes;
+} attent;
+
+int att_getentbyatt(ZServerInfo *zi, attent *res, oid_value set, int att);