Added test tstlogthread which tests log system in multi threaded mode

diff --git a/test/Makefile.am b/test/Makefile.am
index 686af4a..b64cc22 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,9 +1,9 @@
 ## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.
 ## Copyright (C) 1994-2004, Index Data
 ## All rights reserved.

-## $Id: Makefile.am,v 1.7 2005-08-11 14:00:43 adam Exp $
+## $Id: Makefile.am,v 1.8 2005-09-08 13:25:33 adam Exp $

 
 check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \
 
 check_PROGRAMS = tsticonv tstnmem tstmatchstr tstwrbuf tstodr tstccl tstlog \

- tstsoap1 tstsoap2 tstodrstack
+ tstsoap1 tstsoap2 tstodrstack tstlogthread

 check_SCRIPTS = tstcql.sh tstmarc.sh
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 check_SCRIPTS = tstcql.sh tstmarc.sh
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)

@@ -12,9 +12,15 @@ EXTRA_DIST = tstodr.asn tstodrcodec.c tstodrcodec.h cqlsample \
  $(check_SCRIPTS) \
  marc1 marc1.xml marc2 marc2.xml marc3 marc3.xml marc4 marc4.xml
 
  $(check_SCRIPTS) \
  marc1 marc1.xml marc2 marc2.xml marc3 marc3.xml marc4 marc4.xml
 

+if ISTHR
+extra=../src/libyazthread.la
+endif
+

 YAZCOMP = $(top_srcdir)/util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 
 YAZCOMP = $(top_srcdir)/util/yaz-asncomp
 YAZCOMPLINE = $(YAZCOMP) -d z.tcl -i yaz -I../include $(YCFLAGS)
 

+AM_CFLAGS=@CFLAGSTHREADS@
+

 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
 
 dist-hook:
 AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS)
 
 dist-hook:

@@ -26,7 +32,7 @@ dist-hook:
 tstodrcodec.c tstodrcodec.h: tstodr.asn $(YAZCOMP)
        cd $(srcdir); $(YAZCOMP) tstodr.asn
 
 tstodrcodec.c tstodrcodec.h: tstodr.asn $(YAZCOMP)
        cd $(srcdir); $(YAZCOMP) tstodr.asn
 

-LDADD = ../src/libyaz.la
+LDADD = $(extra) ../src/libyaz.la $(LIBTHREAD)

 
 tsticonv_SOURCES = tsticonv.c
 
 
 tsticonv_SOURCES = tsticonv.c
 

@@ -48,3 +54,5 @@ tstsoap1_SOURCES = tstsoap1.c
 
 tstsoap2_SOURCES = tstsoap2.c
 
 
 tstsoap2_SOURCES = tstsoap2.c
 

+tstlogthread_SOURCES = tstlogthread.c
+

diff --git a/test/tstlogthread.c b/test/tstlogthread.c
new file mode 100644 (file)
index 0000000..501795f
--- /dev/null
+++ b/test/tstlogthread.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1998-2005, Index Data.
+ * See the file LICENSE for details.
+ * 
+ * $Id: tstlogthread.c,v 1.1 2005-09-08 13:25:33 adam Exp $
+ */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdlib.h>
+#include <yaz/log.h>
+#include <yaz/options.h>
+
+#if HAVE_POSIX_THREADS
+#include <pthread.h>
+
+
+static void *t_loop2(void *vp)
+{
+    int i, sz = 10;
+
+    for (i = 0; i<sz; i++)
+    {
+#if 0
+        fprintf(stderr, "pr %d\n", i);
+#else
+        yaz_log(YLOG_LOG, "pr %d", i);
+#endif
+    }
+    return 0;
+}
+
+static void t_test()
+{
+    pthread_t tids[4];
+    
+    pthread_create(tids+0, 0, t_loop2, 0);
+    pthread_create(tids+1, 0, t_loop2, 0);
+    pthread_create(tids+2, 0, t_loop2, 0);
+    pthread_create(tids+3, 0, t_loop2, 0);
+    
+    pthread_join(tids[0], 0);
+    pthread_join(tids[1], 0);
+    pthread_join(tids[2], 0);
+    pthread_join(tids[3], 0);
+    exit(0);
+}
+#else
+static void t_test()
+{
+}
+
+#endif
+
+int main(int argc, char **argv)
+{
+    char *arg;
+    int ret;
+
+    while ((ret = options("v:l:", argv, argc, &arg)) != -2)
+    {
+        switch (ret)
+        {
+        case 'v':
+            yaz_log_init_level (yaz_log_mask_str(arg));
+            break;
+        case 'l':
+            yaz_log_init_file(arg);
+            break;
+        default:
+            return 1;
+        }
+    }
+    t_test();
+    return 0;
+}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+