Happy new year

[pazpar2-moved-to-github.git] / src / test_sel_thread.c

diff --git a/src/test_sel_thread.c b/src/test_sel_thread.c
index 2a90e78..25447d8 100644 (file)
--- a/src/test_sel_thread.c
+++ b/src/test_sel_thread.c
@@ -1,7 +1,5 @@
-/* $Id: test_sel_thread.c,v 1.3 2007-04-20 11:56:37 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,13 +12,13 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #if HAVE_CONFIG_H
-#include "cconfig.h"
+#include <config.h>
 #endif
 
 #include "sel_thread.h"
@@ -41,11 +39,18 @@ static void work_handler(void *vp)
     p->y = p->x * 2;
 }
 
+/** \brief how work is destructed */
+static void work_destroy(void *vp)
+{
+    struct my_work_data *p = vp;
+    xfree(p);
+}
+
 /** \brief see if we can create and destroy without problems */
-static void test_1(void)
+static void test_create_destroy(void)
 {
     int fd;
-    sel_thread_t p = sel_thread_create(work_handler, &fd);
+    sel_thread_t p = sel_thread_create(work_handler, 0, &fd, 1);
     YAZ_CHECK(p);
     if (!p)
         return;
@@ -94,30 +99,35 @@ void iochan_handler(struct iochan *i, int event)
 }
 
 /** brief use the fd for something */
-static void test_2(void)
+static void test_for_real_work(int no_threads)
 {
     int thread_fd;
-    sel_thread_t p = sel_thread_create(work_handler, &thread_fd);
+    sel_thread_t p = sel_thread_create(work_handler, work_destroy,
+                                       &thread_fd, no_threads);
     YAZ_CHECK(p);
     if (p)
     {
+        iochan_man_t chan_man = iochan_man_create(10, 0);
         IOCHAN chan = iochan_create(thread_fd, iochan_handler,
-                                    EVENT_INPUT|EVENT_TIMEOUT);
+                                    EVENT_INPUT|EVENT_TIMEOUT, "test_chan");
         iochan_settimeout(chan, 1);
         iochan_setdata(chan, p);
+        iochan_add(chan_man, chan, -1);
 
-        event_loop(&chan);
+        iochan_man_events(chan_man);
         sel_thread_destroy(p);
+        iochan_man_destroy(&chan_man);
     }
 }
 
 int main(int argc, char **argv)
 {
-    YAZ_CHECK_INIT(argc, argv); 
-    YAZ_CHECK_LOG(); 
+    YAZ_CHECK_INIT(argc, argv);
+    YAZ_CHECK_LOG();
 
-    test_1();
-    test_2();
+    test_create_destroy();
+    test_for_real_work(1);
+    test_for_real_work(3);
 
     YAZ_CHECK_TERM;
 }
@@ -128,7 +138,9 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+