Real/User/Sys report from zebraidx

diff --git a/index/main.c b/index/main.c
index 73a0515..1540f5b 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -2,11 +2,12 @@
  * 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.90 2002-06-19 11:37:11 adam Exp $
  */
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <time.h>
 #ifdef WIN32
 #include <io.h>
 #else
@@ -32,6 +33,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 +52,7 @@ int main (int argc, char **argv)
 #endif
 #if HAVE_SYS_TIMES_H
     times(&tms1);
+    gettimeofday(&start_time, 0);
 #endif
 
     rGroupDef.groupName = NULL;
@@ -231,10 +235,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;

diff --git a/test/dmoz/update.sh b/test/dmoz/update.sh
index e99e2bb..c1c113e 100755 (executable)
--- a/test/dmoz/update.sh
+++ b/test/dmoz/update.sh
@@ -1,14 +1,16 @@
 #!/bin/sh
-# $Id: update.sh,v 1.3 2002-06-19 10:29:18 adam Exp $
+# $Id: update.sh,v 1.4 2002-06-19 11:37:11 adam Exp $
 t=$1
 test -n "$t" || exit 1
 rm -f *.mf *.LCK *.tmp
-../../index/zebraidx -l zebraidx.log init 
+../../index/zebraidx -l zebraidx-$t.log init 
 i=0
-rm -f times-$t.log zebraidx-$t.log stat-$t.log
+rm -f times-$t.log stat-$t.log
 while test -f dmoz.$i.xml; do
        echo -n "$i " >>times-$1.log
-       /usr/bin/time -f '%e %U %S %P' -a -o times-$t.log ../../index/zebraidx -l zebraidx-$t.log -c zebra-$t.cfg -f 10 update dmoz.$i.xml 
+       rm -f zebraidx-$t.log
+       ../../index/zebraidx -l zebraidx-$t.log -c zebra-$t.cfg -f 10 update dmoz.$i.xml 
+       grep ' zebraidx times:' zebraidx-$t.log | sed 's/.*zebraidx times://g' >>times-$t.log
        ../../index/zebraidx -l zebraidx-$t.log -c zebra-$t.cfg stat >>stat-$t.log 
        i=`expr $i + 1`
        if test $i = 30; then