X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fmsg-thread.cpp;h=865896ac3967c3ec1ae84cb58b53299059285af5;hp=af65ece3a5ee073263d5636f03b6396e32067e7f;hb=16fee003605b650c1a329694f060c27b5be5e95b;hpb=654c4c47282bad586232db5e5cfbfa97035f1bad

diff --git a/src/msg-thread.cpp b/src/msg-thread.cpp
index af65ece..865896a 100644
--- a/src/msg-thread.cpp
+++ b/src/msg-thread.cpp
@@ -1,7 +1,7 @@
-/* $Id: msg-thread.cpp,v 1.4 2005-06-10 22:54:22 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
+/* $Id: msg-thread.cpp,v 1.12 2006-03-30 10:31:17 adam Exp $
+   Copyright (c) 1998-2006, Index Data.
 
-This file is part of the yaz-proxy.
+This file is part of the yazproxy.
 
 YAZ proxy 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
@@ -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;
@@ -58,7 +63,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;
@@ -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,24 +89,30 @@ 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()
 {
     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);
 
     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]);
@@ -111,13 +122,13 @@ void Msg_Thread::socketNotify(int event)
 {
     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();
     }
 }
 
@@ -125,29 +136,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);
     }
 }
 
@@ -158,3 +163,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
+ */
+