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

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index c69ecfd..0b6d91c 100644
--- 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.7 2005-08-15 12:51:57 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -84,7 +84,6 @@ 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);
 }
 
@@ -101,7 +100,6 @@ Msg_Thread::~Msg_Thread()
 
     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 +124,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);
     }
 }