X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;h=360fe73d0fc2ee2c02350d23da03a30ef21a1369;hb=0ab6e8aba7de1ea5cf109de175f56c9d8f7f49bc;hp=180f385aae736516706be355ad853c7445fdbe2e;hpb=323af6850b8aba94fb86edb303867dc55dc2eb7f;p=metaproxy-moved-to-github.git

diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp
index 180f385..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.10 2005-11-07 12:31:05 adam Exp $
-   Copyright (c) 2005, 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
@@ -13,6 +28,10 @@
 #include <winsock.h>
 #endif
 
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
@@ -22,12 +41,13 @@
 
 #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 yp2 {
+namespace metaproxy_1 {
     class ThreadPoolSocketObserver::Worker {
     public:
         Worker(ThreadPoolSocketObserver *s) : m_s(s) {};
@@ -44,24 +64,27 @@ namespace yp2 {
         ~Rep();
     private:
         yazpp_1::ISocketObservable *m_socketObservable;
-        int m_fd[2];
+        Pipe m_pipe;
         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 yp2;
+using namespace metaproxy_1;
 
-ThreadPoolSocketObserver::Rep::Rep(ISocketObservable *obs)
-    : m_socketObservable(obs)
+ThreadPoolSocketObserver::Rep::Rep(yazpp_1::ISocketObservable *obs)
+    : m_socketObservable(obs), m_pipe(9123)
 {
 }
 
@@ -74,12 +97,11 @@ IThreadPoolMsg::~IThreadPoolMsg()
 
 }
 
-ThreadPoolSocketObserver::ThreadPoolSocketObserver(ISocketObservable *obs,
-                                                   int no_threads)
+ThreadPoolSocketObserver::ThreadPoolSocketObserver(
+    yazpp_1::ISocketObservable *obs, int no_threads)
     : m_p(new Rep(obs))
 {
-    pipe(m_p->m_fd);
-    obs->addObserver(m_p->m_fd[0], this);
+    obs->addObserver(m_p->m_pipe.read_fd(), this);
     obs->maskObserver(this, SOCKET_OBSERVE_READ);
 
     m_p->m_stop_flag = false;
@@ -102,9 +124,6 @@ ThreadPoolSocketObserver::~ThreadPoolSocketObserver()
     m_p->m_thrds.join_all();
 
     m_p->m_socketObservable->deleteObserver(this);
-
-    close(m_p->m_fd[0]);
-    close(m_p->m_fd[1]);
 }
 
 void ThreadPoolSocketObserver::socketNotify(int event)
@@ -112,7 +131,11 @@ void ThreadPoolSocketObserver::socketNotify(int event)
     if (event & SOCKET_OBSERVE_READ)
     {
         char buf[2];
-        read(m_p->m_fd[0], buf, 1);
+#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);
@@ -137,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);
-            write(m_p->m_fd[1], "", 1);
+#ifdef WIN32
+            send(m_p->m_pipe.write_fd(), "", 1, 0);
+#else
+            write(m_p->m_pipe.write_fd(), "", 1);
+#endif
         }
     }
 }
@@ -151,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();
 }