X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmsg-thread.cpp;h=0b6d91cad8e2a744e2851634bcb684567d841b7f;hb=4e7b65539b3bea310f8d626d42e64cfd9e054dd5;hp=78c3c31719d6db97a0beb0f237bdb1dd13d0ff7c;hpb=eb2b00deb4ecc5a3fbfbef11f57790c1659ab3e2;p=yazproxy-moved-to-github.git

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index 78c3c31..0b6d91c 100644
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,4 +1,4 @@
-/* $Id: msg-thread.cpp,v 1.2 2005-06-02 06:40:46 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.
@@ -21,6 +21,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <pthread.h>
 #include <unistd.h>
 #include <ctype.h>
+#include <stdio.h>
 
 #include <yaz++/socket-observer.h>
 #include <yaz/log.h>
@@ -57,7 +58,7 @@ IMsg_Thread *Msg_Thread_Queue::dequeue()
     if (!*l)
         return 0;
     while ((*l)->m_next)
-	l = &(*l)->m_next;
+        l = &(*l)->m_next;
     IMsg_Thread *m = (*l)->m_item;
     delete *l;
     *l = 0;
@@ -72,18 +73,17 @@ static void *tfunc(void *p)
 }
 
 
-Msg_Thread::Msg_Thread(IYazSocketObservable *obs)
+Msg_Thread::Msg_Thread(ISocketObservable *obs)
     : m_SocketObservable(obs)
 {
     pipe(m_fd);
     obs->addObserver(m_fd[0], this);
-    obs->maskObserver(this, YAZ_SOCKET_OBSERVE_READ);
+    obs->maskObserver(this, SOCKET_OBSERVE_READ);
 
     m_stop_flag = false;
     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);
 }
 
@@ -100,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]);
@@ -108,15 +107,15 @@ Msg_Thread::~Msg_Thread()
 
 void Msg_Thread::socketNotify(int event)
 {
-    if (event & YAZ_SOCKET_OBSERVE_READ)
+    if (event & SOCKET_OBSERVE_READ)
     {
-	char buf[2];
-	read(m_fd[0], buf, 1);
-	pthread_mutex_lock(&m_mutex_output_data);
-	IMsg_Thread *out = m_output.dequeue();
-	pthread_mutex_unlock(&m_mutex_output_data);
-	if (out)
-	    out->result();
+        char buf[2];
+        read(m_fd[0], buf, 1);
+        pthread_mutex_lock(&m_mutex_output_data);
+        IMsg_Thread *out = m_output.dequeue();
+        pthread_mutex_unlock(&m_mutex_output_data);
+        if (out)
+            out->result();
     }
 }
 
@@ -124,29 +123,23 @@ 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)
-	{
-	    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);
-	}
+        pthread_mutex_lock(&m_mutex_input_data);
+        while (!m_stop_flag && m_input.size() == 0)
+            pthread_cond_wait(&m_cond_input_data, &m_mutex_input_data);
+        if (m_stop_flag)
+        {
+            pthread_mutex_unlock(&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);
     }
 }
 
@@ -157,3 +150,11 @@ void Msg_Thread::put(IMsg_Thread *m)
     pthread_cond_signal(&m_cond_input_data);
     pthread_mutex_unlock(&m_mutex_input_data);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+