Add destructor for class (interface) IMsg_Thread.

[yazproxy-moved-to-github.git] / src / msg-thread.cpp

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index c69ecfd..69ea656 100644 (file)
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,4 +1,4 @@
-/* $Id: msg-thread.cpp,v 1.5 2005-06-25 15:58:33 adam Exp $
+/* $Id: msg-thread.cpp,v 1.9 2005-09-26 09:22:59 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -30,6 +30,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 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,8 +89,12 @@ 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_cond_init(&m_cond_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()
@@ -95,13 +104,15 @@ Msg_Thread::~Msg_Thread()
     pthread_cond_signal(&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);
 
     pthread_cond_destroy(&m_cond_input_data);
     pthread_mutex_destroy(&m_mutex_input_data);
-    pthread_cond_destroy(&m_cond_output_data);
     pthread_mutex_destroy(&m_mutex_output_data);
     close(m_fd[0]);
     close(m_fd[1]);
@@ -126,28 +137,22 @@ void Msg_Thread::run(void *p)
     while(1)
     {
         pthread_mutex_lock(&m_mutex_input_data);
-        pthread_cond_wait(&m_cond_input_data, &m_mutex_input_data);
-        while (1)
+        while (!m_stop_flag && m_input.size() == 0)
+            pthread_cond_wait(&m_cond_input_data, &m_mutex_input_data);
+        if (m_stop_flag)
         {
-            if (m_stop_flag)
-            {
-                pthread_mutex_unlock(&m_mutex_input_data);
-                return;
-            }
-            IMsg_Thread *in = m_input.dequeue();
             pthread_mutex_unlock(&m_mutex_input_data);
-            if (!in)
-                break;
-            IMsg_Thread *out = in->handle();
-            pthread_mutex_lock(&m_mutex_output_data);
-            m_output.enqueue(out);
-            pthread_cond_signal(&m_cond_output_data);
-            pthread_mutex_unlock(&m_mutex_output_data);
-
-            write(m_fd[1], "", 1);
-
-            pthread_mutex_lock(&m_mutex_input_data);
+            break;
         }
+        IMsg_Thread *in = m_input.dequeue();
+        pthread_mutex_unlock(&m_mutex_input_data);
+
+        IMsg_Thread *out = in->handle();
+        pthread_mutex_lock(&m_mutex_output_data);
+        m_output.enqueue(out);
+        
+        write(m_fd[1], "", 1);
+        pthread_mutex_unlock(&m_mutex_output_data);
     }
 }