X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fthread_pool_observer.hpp;h=9875d302e3a6716c5c60eada9b237df53165c7e7;hb=f1de0d00348a888657fa7940421de0a62e0c1957;hp=c09eba470eb857785ef06cc945dd24987cb50da3;hpb=f82b19f2b93707657fee804bd1242f2548d51ada;p=metaproxy-moved-to-github.git

diff --git a/src/thread_pool_observer.hpp b/src/thread_pool_observer.hpp
index c09eba4..9875d30 100644
--- a/src/thread_pool_observer.hpp
+++ b/src/thread_pool_observer.hpp
@@ -1,4 +1,4 @@
-/* $Id: thread_pool_observer.hpp,v 1.4 2005-10-15 14:09:09 adam Exp $
+/* $Id: thread_pool_observer.hpp,v 1.7 2005-11-07 12:31:05 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -7,14 +7,8 @@
 #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 <yaz/yconfig.h>
 
@@ -27,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