X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_mutex.c;h=2327b8ea44d22eecf019f5e0d0824b1c67c80ca3;hp=843ea8f40a9c8163f71305038d262fdcecd92cae;hb=077c4e7bb226de0f6414674e01a838498a49867b;hpb=83bf5a83b9296d6fe16e55d2c54209c35d2fa20b

diff --git a/test/test_mutex.c b/test/test_mutex.c
index 843ea8f..2327b8e 100644
--- a/test/test_mutex.c
+++ b/test/test_mutex.c
@@ -1,16 +1,28 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <yaz/mutex.h>
+#include <yaz/thread_create.h>
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef WIN32
+#include <windows.h>
+#endif
+
 #include <yaz/test.h>
 #include <yaz/log.h>
+#include <yaz/gettimeofday.h>
 
-static void tst(void)
+static void tst_mutex(void)
 {
     YAZ_MUTEX p = 0;
 
@@ -32,11 +44,76 @@ static void tst(void)
     yaz_mutex_destroy(&p); /* OK to "destroy" NULL handle */
 }
 
+static void tst_cond(void)
+{
+    YAZ_MUTEX p = 0;
+    YAZ_COND c;
+    struct timeval abstime;
+    int r;
+
+    yaz_mutex_create(&p);
+    YAZ_CHECK(p);
+    if (!p)
+        return;
+
+    yaz_cond_create(&c);
+    if (c)
+    {
+        r = yaz_gettimeofday(&abstime);
+        YAZ_CHECK_EQ(r, 0);
+
+        abstime.tv_sec += 1; /* wait 1 second */
+
+        r = yaz_cond_wait(c, p, &abstime);
+        YAZ_CHECK(r != 0);
+
+    }
+    yaz_cond_destroy(&c);
+    YAZ_CHECK(c == 0);
+    yaz_mutex_destroy(&p);
+    YAZ_CHECK(p == 0);
+}
+
+static void *my_handler(void *arg)
+{
+    int *mydata = (int*) arg;
+    (*mydata)++;
+    return mydata;
+}
+
+static void tst_create_thread(void)
+{
+    void *return_data;
+    int mydata0 = 42;
+    int mydata1= 42;
+    yaz_thread_t t[2];
+
+    t[0] = yaz_thread_create(my_handler, &mydata0);
+    YAZ_CHECK(t[0]);
+    t[1] = yaz_thread_create(my_handler, &mydata1);
+    YAZ_CHECK(t[1]);
+
+    return_data = 0;
+    yaz_thread_join(&t[0], &return_data);
+    YAZ_CHECK(!t[0]);
+    YAZ_CHECK(return_data == &mydata0);
+
+    return_data = 0;
+    yaz_thread_join(&t[1], &return_data);
+    YAZ_CHECK(!t[1]);
+    YAZ_CHECK(return_data == &mydata1);
+
+    YAZ_CHECK_EQ(mydata0, 43);
+    YAZ_CHECK_EQ(mydata1, 43);
+}
+
 int main (int argc, char **argv)
 {
     YAZ_CHECK_INIT(argc, argv);
     YAZ_CHECK_LOG();
-    tst();
+    tst_mutex();
+    tst_cond();
+    tst_create_thread();
     YAZ_CHECK_TERM;
 }