X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmsg-thread.cpp;h=17029ec4032ee1e9bf49238a20b6b2729d8e74be;hb=8dc6d0bc4ddbb2d37b3aafd93396a0e4a8e87560;hp=0b6d91cad8e2a744e2851634bcb684567d841b7f;hpb=4e7b65539b3bea310f8d626d42e64cfd9e054dd5;p=yazproxy-moved-to-github.git

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index 0b6d91c..17029ec 100644
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,4 +1,4 @@
-/* $Id: msg-thread.cpp,v 1.7 2005-08-15 12:51:57 adam Exp $
+/* $Id: msg-thread.cpp,v 1.11 2006-03-29 13:33:47 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -23,13 +23,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <ctype.h>
 #include <stdio.h>
 
-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>
 #include <yaz/log.h>
 
 #include "msg-thread.h"
 
 using namespace yazpp_1;
 
+IMsg_Thread::~IMsg_Thread()
+{
+
+}
+
 Msg_Thread_Queue::Msg_Thread_Queue()
 {
     m_list = 0;
@@ -73,7 +78,7 @@ static void *tfunc(void *p)
 }
 
 
-Msg_Thread::Msg_Thread(ISocketObservable *obs)
+Msg_Thread::Msg_Thread(ISocketObservable *obs, int no_threads)
     : m_SocketObservable(obs)
 {
     pipe(m_fd);
@@ -84,17 +89,25 @@ Msg_Thread::Msg_Thread(ISocketObservable *obs)
     pthread_mutex_init(&m_mutex_input_data, 0);
     pthread_cond_init(&m_cond_input_data, 0);
     pthread_mutex_init(&m_mutex_output_data, 0);
-    pthread_create(&m_thread_id, 0, tfunc, this);
+
+    m_no_threads = no_threads;
+    m_thread_id = new pthread_t[no_threads];
+    int i;
+    for (i = 0; i<m_no_threads; i++)
+        pthread_create(&m_thread_id[i], 0, tfunc, this);
 }
 
 Msg_Thread::~Msg_Thread()
 {
     pthread_mutex_lock(&m_mutex_input_data);
     m_stop_flag = true;
-    pthread_cond_signal(&m_cond_input_data);
+    pthread_cond_broadcast(&m_cond_input_data);
     pthread_mutex_unlock(&m_mutex_input_data);
     
-    pthread_join(m_thread_id, 0);
+    int i;
+    for (i = 0; i<m_no_threads; i++)
+        pthread_join(m_thread_id[i], 0);
+    delete [] m_thread_id;
 
     m_SocketObservable->deleteObserver(this);