X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fthread_pool_observer.hpp;h=cb1d70c481b627e162d937c43e4c4452c0b74212;hb=b70b9ec78f0ab1c3ed3b432de986159129a0e4ed;hp=c52dca10e81434db34fb2c8cfab2188b2c9d4fd5;hpb=5ed8cae5f8518ca4502a51f3884b323f4dbd744a;p=metaproxy-moved-to-github.git

diff --git a/src/thread_pool_observer.hpp b/src/thread_pool_observer.hpp
index c52dca1..cb1d70c 100644
--- a/src/thread_pool_observer.hpp
+++ b/src/thread_pool_observer.hpp
@@ -1,39 +1,18 @@
-/* $Id: thread_pool_observer.hpp,v 1.3 2005-10-14 10:27:18 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
+/* $Id: thread_pool_observer.hpp,v 1.11 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-This file is part of the yaz-proxy.
-
-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
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-YAZ proxy 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 YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+   See the LICENSE file for details
  */
 
 #ifndef YP2_THREAD_POOL_OBSERVER_HPP
 #define YP2_THREAD_POOL_OBSERVER_HPP
 
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
+#include <boost/scoped_ptr.hpp>
 
-#include <unistd.h>
-#include <ctype.h>
-
-#include <deque>
-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>
 #include <yaz/yconfig.h>
 
-namespace yp2 {
+namespace metaproxy_1 {
     class IThreadPoolMsg {
     public:
         virtual IThreadPoolMsg *handle() = 0;
@@ -42,38 +21,19 @@ namespace yp2 {
     };
 
     class ThreadPoolSocketObserver : public yazpp_1::ISocketObserver {
-    private:
-        class Worker {
-        public:
-            Worker(ThreadPoolSocketObserver *s) : m_s(s) {};
-            ThreadPoolSocketObserver *m_s;
-            void operator() (void) {
-                m_s->run(0);
-            }
-        };
+        class Rep;
+        class Worker;
     public:
         ThreadPoolSocketObserver(yazpp_1::ISocketObservable *obs,
                                  int no_threads);
         virtual ~ThreadPoolSocketObserver();
-        void socketNotify(int event);
         void put(IThreadPoolMsg *m);
         IThreadPoolMsg *get();
         void run(void *p);
-        int m_fd[2];
     private:
-        yazpp_1::ISocketObservable *m_SocketObservable;
-        int m_no_threads;
-        boost::thread_group m_thrds;
-
-        std::deque<IThreadPoolMsg *> m_input;
-        std::deque<IThreadPoolMsg *> m_output;
-
-        boost::mutex m_mutex_input_data;
-        boost::condition m_cond_input_data;
-        boost::mutex m_mutex_output_data;
-        bool m_stop_flag;
+        void socketNotify(int event);
+        boost::scoped_ptr<Rep> m_p;
 
-    
     };
 }
 #endif
@@ -81,6 +41,7 @@ namespace yp2 {
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */