Fix link to yaz++.

[metaproxy-moved-to-github.git] / src / thread_pool_observer.cpp

diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp
index e87090c..36cf783 100644 (file)
--- a/src/thread_pool_observer.cpp
+++ b/src/thread_pool_observer.cpp
@@ -1,8 +1,7 @@
+/* $Id: thread_pool_observer.cpp,v 1.20 2007-04-18 12:06:59 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-/* $Id: thread_pool_observer.cpp,v 1.15 2006-03-29 13:44:45 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
-
-%LICENSE%
+   See the LICENSE file for details
  */
 #include "config.hpp"
 
@@ -32,8 +31,6 @@
 #include "thread_pool_observer.hpp"
 #include "pipe.hpp"
 
-namespace mp = metaproxy_1;
-
 namespace metaproxy_1 {
     class ThreadPoolSocketObserver::Worker {
     public:
@@ -55,19 +52,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 +81,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 +115,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 +144,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 +163,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();
 }