X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;h=360fe73d0fc2ee2c02350d23da03a30ef21a1369;hb=637a685d61a9ff0e3f398a59da426979815c4d68;hp=0c99422f4349188186fc411df3d805f1e808b598;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git

diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp
index 0c99422..360fe73 100644
--- a/src/thread_pool_observer.cpp
+++ b/src/thread_pool_observer.cpp
@@ -1,9 +1,24 @@
+/* $Id: thread_pool_observer.cpp,v 1.21 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-/* $Id: thread_pool_observer.cpp,v 1.14 2006-03-16 10:40:59 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+This file is part of Metaproxy.
 
-%LICENSE%
+Metaproxy 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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
+
 #include "config.hpp"
 
 #if HAVE_UNISTD_H
@@ -26,14 +41,12 @@
 
 #include <deque>
 
-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>
 #include <yaz/log.h>
 
 #include "thread_pool_observer.hpp"
 #include "pipe.hpp"
 
-namespace mp = metaproxy_1;
-
 namespace metaproxy_1 {
     class ThreadPoolSocketObserver::Worker {
     public:
@@ -55,19 +68,22 @@ namespace metaproxy_1 {
         boost::thread_group m_thrds;
         boost::mutex m_mutex_input_data;
         boost::condition m_cond_input_data;
+        boost::condition m_cond_input_full;
         boost::mutex m_mutex_output_data;
         std::deque<IThreadPoolMsg *> m_input;
         std::deque<IThreadPoolMsg *> m_output;
         bool m_stop_flag;
-        int m_no_threads;
+        unsigned m_no_threads;
     };
+    const unsigned int queue_size_per_thread = 64;
 }
 
 
+
 using namespace yazpp_1;
-using namespace mp;
+using namespace metaproxy_1;
 
-ThreadPoolSocketObserver::Rep::Rep(ISocketObservable *obs)
+ThreadPoolSocketObserver::Rep::Rep(yazpp_1::ISocketObservable *obs)
     : m_socketObservable(obs), m_pipe(9123)
 {
 }
@@ -81,8 +97,8 @@ IThreadPoolMsg::~IThreadPoolMsg()
 
 }
 
-ThreadPoolSocketObserver::ThreadPoolSocketObserver(ISocketObservable *obs,
-                                                   int no_threads)
+ThreadPoolSocketObserver::ThreadPoolSocketObserver(
+    yazpp_1::ISocketObservable *obs, int no_threads)
     : m_p(new Rep(obs))
 {
     obs->addObserver(m_p->m_pipe.read_fd(), this);
@@ -115,7 +131,11 @@ void ThreadPoolSocketObserver::socketNotify(int event)
     if (event & SOCKET_OBSERVE_READ)
     {
         char buf[2];
+#ifdef WIN32
         recv(m_p->m_pipe.read_fd(), buf, 1, 0);
+#else
+        read(m_p->m_pipe.read_fd(), buf, 1);
+#endif
         IThreadPoolMsg *out;
         {
             boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
@@ -140,13 +160,18 @@ void ThreadPoolSocketObserver::run(void *p)
                 break;
             
             in = m_p->m_input.front();
-            m_p->m_input.pop_front();
+            m_p->m_input.pop_front(); 
+            m_p->m_cond_input_full.notify_all();
         }
         IThreadPoolMsg *out = in->handle();
         {
             boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
             m_p->m_output.push_back(out);
+#ifdef WIN32
             send(m_p->m_pipe.write_fd(), "", 1, 0);
+#else
+            write(m_p->m_pipe.write_fd(), "", 1);
+#endif
         }
     }
 }
@@ -154,6 +179,8 @@ void ThreadPoolSocketObserver::run(void *p)
 void ThreadPoolSocketObserver::put(IThreadPoolMsg *m)
 {
     boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data);
+    while (m_p->m_input.size() >= m_p->m_no_threads * queue_size_per_thread)
+        m_p->m_cond_input_full.wait(input_lock);
     m_p->m_input.push_back(m);
     m_p->m_cond_input_data.notify_one();
 }