X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=c32c41993e9895cf3aaa8160375a4360fbb41e90;hb=9839f960344403921a7740bed060088054034a5d;hp=73a05154eac80c11781be9f9bd6fc3bc184620b8;hpb=3e72747f4b28856e5f684dbe8984f8fb28680e62;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 73a0515..c32c419 100644
--- a/index/main.c
+++ b/index/main.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1994-2002, Index Data
  * All rights reserved.
  *
- * $Id: main.c,v 1.89 2002-04-26 08:44:47 adam Exp $
+ * $Id: main.c,v 1.92 2002-07-11 13:03:01 heikki Exp $
  */
 #include <stdio.h>
 #include <string.h>
@@ -11,7 +11,9 @@
 #include <io.h>
 #else
 #include <unistd.h>
+#include <sys/time.h>
 #endif
+#include <time.h>
 #if HAVE_SYS_TIMES_H
 #include <sys/times.h>
 #endif
@@ -32,6 +34,8 @@ int main (int argc, char **argv)
     size_t mem_max = 0;
 #if HAVE_SYS_TIMES_H
     struct tms tms1, tms2;
+    struct timeval start_time, end_time;
+    long usec;
 #endif
 #ifndef WIN32
     char nbuf[100];
@@ -49,6 +53,7 @@ int main (int argc, char **argv)
 #endif
 #if HAVE_SYS_TIMES_H
     times(&tms1);
+    gettimeofday(&start_time, 0);
 #endif
 
     rGroupDef.groupName = NULL;
@@ -146,7 +151,11 @@ int main (int argc, char **argv)
                 }
                 else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
                 {
-                    zebra_register_statistics (zh);
+                    zebra_register_statistics (zh,0);
+                }
+                else if (!strcmp (arg, "dump") || !strcmp (arg, "dumpdict"))
+                {
+                    zebra_register_statistics (zh,1);
                 }
                 else if (!strcmp (arg, "compact"))
                 {
@@ -231,10 +240,14 @@ int main (int argc, char **argv)
     zebra_close (zh);
     zebra_stop (zs);
 #if HAVE_SYS_TIMES_H
+    gettimeofday(&end_time, 0);
+    usec = (end_time.tv_sec - start_time.tv_sec) * 1000000L +
+	    end_time.tv_usec - start_time.tv_usec;
     times(&tms2);
-    yaz_log (LOG_LOG, "zebraidx user/system: %ld/%ld",
-		(long) tms2.tms_utime - tms1.tms_utime,
-		(long) tms2.tms_stime - tms1.tms_stime);
+    yaz_log (LOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
+		(double) usec / 1000000.0,
+		(double) (tms2.tms_utime - tms1.tms_utime)/100,
+		(double) (tms2.tms_stime - tms1.tms_stime)/100);
 #endif
     exit (0);
     return 0;