Client display time elapsed.

diff --git a/client/client.c b/client/client.c
index a440165..16ac8e4 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: client.c,v $
- * Revision 1.101  2000-04-05 07:39:54  adam
+ * Revision 1.102  2000-05-18 11:57:04  adam
+ * Client display time elapsed.
+ *
+ * Revision 1.101  2000/04/05 07:39:54  adam
  * Added shared library support (libtool).
  *
  * Revision 1.100  2000/03/20 19:29:59  adam
@@ -2295,6 +2298,10 @@ static int client(int wait)
     int netbufferlen = 0;
     int i;
     Z_APDU *apdu;
+#if HAVE_GETTIMEOFDAY
+    struct timeval tv_start, tv_end;
+    gettimeofday (&tv_start, 0);
+#endif
 
     while (1)
     {
@@ -2341,6 +2348,10 @@ static int client(int wait)
            if ((end_p = strchr (line, '\n')))
                *end_p = '\0';
 #endif 
+#if HAVE_GETTIMEOFDAY
+           gettimeofday (&tv_start, 0);
+#endif
+
             if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0)
             {
                 strcpy(word, last_cmd);
@@ -2455,6 +2466,15 @@ static int client(int wait)
                 }
             }
             while (conn && cs_more(conn));
+#if HAVE_GETTIMEOFDAY
+           gettimeofday (&tv_end, 0);
+           if (1)
+           {
+               printf ("Elapsed: %.6f\n", (double) tv_end.tv_usec /
+                                                1e6 + tv_end.tv_sec -
+                  ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec));
+           }
+#endif
         }
     }
     return 0;
@@ -2496,7 +2516,7 @@ int main(int argc, char **argv)
            log_init (log_mask_str(arg), "", NULL);
            break;
         default:
-            fprintf (stderr, "Usage: %s [-m <marclog>] [ -m <apdulog>] "
+            fprintf (stderr, "Usage: %s [-m <marclog>] [ -a <apdulog>] "
                              "[<server-addr>]\n",
                      prog);
             exit (1);

diff --git a/configure b/configure
index 7d53d14..0b9469b 100755 (executable)
--- a/configure
+++ b/configure
@@ -2035,7 +2035,7 @@ fi
 done
 
 fi
-for ac_func in vsnprintf
+for ac_func in vsnprintf gettimeofday
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:2042: checking for $ac_func" >&5

diff --git a/configure.in b/configure.in
index 3d5da61..5d17926 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl YAZ Toolkit
 dnl (c) Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.27 2000-05-02 19:32:15 adam Exp $
+dnl $Id: configure.in,v 1.28 2000-05-18 11:57:04 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
@@ -64,7 +64,7 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
        AC_CHECK_HEADERS(readline/readline.h readline/history.h)
 fi
 dnl ------ snprintf
-AC_CHECK_FUNCS(vsnprintf)
+AC_CHECK_FUNCS(vsnprintf gettimeofday)
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd           enable TCP wrapper for server if available])

diff --git a/util/Makefile.am b/util/Makefile.am
index e40c729..690bece 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,6 @@
 ## Copyright (C) 1994-2000, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.6 2000-04-05 07:39:55 adam Exp $
+## $Id: Makefile.am,v 1.7 2000-05-18 11:57:05 adam Exp $
 
 noinst_LTLIBRARIES = libutil.la
 
@@ -12,5 +12,11 @@ LIBS =
 
 INCLUDES =-I$(srcdir)/../include
 
+noinst_PROGRAMS = marcdump
+
+marcdump_LDADD = libutil.la 
+
+marcdump_SOURCES = marcdump.c
+
 libutil_la_SOURCES=options.c log.c marcdisp.c oid.c wrbuf.c nmemsdup.c \
    xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c 

diff --git a/util/Makefile.in b/util/Makefile.in
index 822f07d..0324485 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -88,6 +88,12 @@ LIBS =
 
 INCLUDES = -I$(srcdir)/../include
 
+noinst_PROGRAMS = marcdump
+
+marcdump_LDADD = libutil.la 
+
+marcdump_SOURCES = marcdump.c
+
 libutil_la_SOURCES = options.c log.c marcdisp.c oid.c wrbuf.c nmemsdup.c    xmalloc.c readconf.c tpath.c nmem.c matchstr.c atoin.c 
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -103,6 +109,11 @@ libutil_la_LIBADD =
 libutil_la_OBJECTS =  options.lo log.lo marcdisp.lo oid.lo wrbuf.lo \
 nmemsdup.lo xmalloc.lo readconf.lo tpath.lo nmem.lo matchstr.lo \
 atoin.lo
+PROGRAMS =  $(noinst_PROGRAMS)
+
+marcdump_OBJECTS =  marcdump.o
+marcdump_DEPENDENCIES =  libutil.la
+marcdump_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS)
 
 CFLAGS = @CFLAGS@
@@ -117,11 +128,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-DEP_FILES =  .deps/atoin.P .deps/log.P .deps/marcdisp.P .deps/matchstr.P \
-.deps/nmem.P .deps/nmemsdup.P .deps/oid.P .deps/options.P \
-.deps/readconf.P .deps/tpath.P .deps/wrbuf.P .deps/xmalloc.P
-SOURCES = $(libutil_la_SOURCES)
-OBJECTS = $(libutil_la_OBJECTS)
+DEP_FILES =  .deps/atoin.P .deps/log.P .deps/marcdisp.P .deps/marcdump.P \
+.deps/matchstr.P .deps/nmem.P .deps/nmemsdup.P .deps/oid.P \
+.deps/options.P .deps/readconf.P .deps/tpath.P .deps/wrbuf.P \
+.deps/xmalloc.P
+SOURCES = $(libutil_la_SOURCES) $(marcdump_SOURCES)
+OBJECTS = $(libutil_la_OBJECTS) $(marcdump_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -178,6 +190,19 @@ maintainer-clean-libtool:
 libutil.la: $(libutil_la_OBJECTS) $(libutil_la_DEPENDENCIES)
        $(LINK)  $(libutil_la_LDFLAGS) $(libutil_la_OBJECTS) $(libutil_la_LIBADD) $(LIBS)
 
+mostlyclean-noinstPROGRAMS:
+
+clean-noinstPROGRAMS:
+       -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+distclean-noinstPROGRAMS:
+
+maintainer-clean-noinstPROGRAMS:
+
+marcdump: $(marcdump_OBJECTS) $(marcdump_DEPENDENCIES)
+       @rm -f marcdump
+       $(LINK) $(marcdump_LDFLAGS) $(marcdump_OBJECTS) $(marcdump_LDADD) $(LIBS)
+
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -297,7 +322,7 @@ install-am: all-am
 install: install-am
 uninstall-am: uninstall-binSCRIPTS
 uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES) $(SCRIPTS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -315,27 +340,30 @@ distclean-generic:
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
-               mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-               mostlyclean-generic
+               mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+               mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
-               clean-tags clean-depend clean-generic mostlyclean-am
+               clean-noinstPROGRAMS clean-tags clean-depend \
+               clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
-               distclean-libtool distclean-tags distclean-depend \
-               distclean-generic clean-am
+               distclean-libtool distclean-noinstPROGRAMS \
+               distclean-tags distclean-depend distclean-generic \
+               clean-am
        -rm -f libtool
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
                maintainer-clean-compile maintainer-clean-libtool \
-               maintainer-clean-tags maintainer-clean-depend \
-               maintainer-clean-generic distclean-am
+               maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+               maintainer-clean-depend maintainer-clean-generic \
+               distclean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
@@ -345,11 +373,13 @@ maintainer-clean: maintainer-clean-am
 clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \
-install-binSCRIPTS tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
+clean-libtool maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
+tags mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
+distdir mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
 all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \