X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=6fa3fae6ce51917be12c9d3ea291dc72b11e4477;hb=0ca8a9894b43c838980d650dd265f7a3da4ed219;hp=9d915611470630c01a7aad0d7fd9e5b9b9f58b03;hpb=0b5d38bc84d5261aaed3bce3be748c5d7008f2ff;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index 9d91561..6fa3fae 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.42  1996-11-08 11:10:36  adam
+ * Revision 1.46  1997-07-28 08:30:47  adam
+ * Server returns diagnostic 14 when record doesn't exist.
+ *
+ * Revision 1.45  1996/12/23 15:30:45  adam
+ * Work on truncation.
+ * Bug fix: result sets weren't deleted after server shut down.
+ *
+ * Revision 1.44  1996/12/11 12:08:01  adam
+ * Added better compression.
+ *
+ * Revision 1.43  1996/11/15 15:03:58  adam
+ * Logging of execution speed by using the times(2) call.
+ *
+ * Revision 1.42  1996/11/08  11:10:36  adam
  * Buffers used during file match got bigger.
  * Compressed ISAM support everywhere.
  * Bug fixes regarding masking characters in queries.
@@ -164,10 +177,24 @@
 #include <data1.h>
 #include <recctrl.h>
 #include <dmalloc.h>
+
+#define USE_TIMES 1
+#ifdef __linux__
+#define USE_TIMES 1
+#endif
+
+#if USE_TIMES
+#include <sys/times.h>
+#endif
 #include "zserver.h"
 
 ZServerInfo server_info;
 
+#if USE_TIMES
+static struct tms tms1;
+static struct tms tms2;
+#endif
+
 static int register_lock (ZServerInfo *zi)
 {
     time_t lastChange;
@@ -182,6 +209,9 @@ static int register_lock (ZServerInfo *zi)
         state = 0;
     }
     zebraServerLock (state);
+#if USE_TIMES
+    times (&tms1);
+#endif
     if (zi->registerState == state)
     {
         if (zi->registerChange >= lastChange)
@@ -233,6 +263,12 @@ static void register_unlock (ZServerInfo *zi)
 {
     static int waitSec = -1;
 
+#if USE_TIMES
+    times (&tms2);
+    logf (LOG_LOG, "user/system: %ld/%ld",
+			(long) (tms2.tms_utime - tms1.tms_utime),
+			(long) (tms2.tms_stime - tms1.tms_stime));
+#endif
     if (waitSec == -1)
     {
         char *s = res_get (common_resource, "debugRequestWait");
@@ -357,12 +393,8 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     rec = rec_get (zi->records, sysno);
     if (!rec)
     {
-        char *msg = "Record is deleted\n";
-        *output_format = VAL_SUTRS;
-        *rec_bufp = msg;
-        *rec_lenp = strlen (msg);
         logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno);
-        return 0;
+        return 14;
     }
     file_type = rec->info[recInfo_fileType];
     fname = rec->info[recInfo_filename];
@@ -390,15 +422,11 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
     {
         if ((fd = open (fname, O_RDONLY)) == -1)
         {
-            char *msg = "Record doesn't exist\n";
-            logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname);
-            *output_format = VAL_SUTRS;
-            *rec_bufp = msg;
-            *rec_lenp = strlen (msg);
+            logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s",
+		  fname);
             rec_rm (&rec);
-            return 0;     /* or 14: System error in presenting records */
+            return 14;
         }
-
         memcpy (&record_offset, rec->info[recInfo_offset],
                 sizeof(record_offset));
 
@@ -500,6 +528,7 @@ void bend_close (void *handle)
 {
     if (server_info.records)
     {
+        resultSetDestroy (&server_info);
         dict_close (server_info.dict);
         if (server_info.isam)
             is_close (server_info.isam);