X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fthread_pool_observer.hpp;h=630b39b3d865ce86c26632927dbb4861f7a338c3;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;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..630b39b 100644
--- a/src/thread_pool_observer.hpp
+++ b/src/thread_pool_observer.hpp
@@ -1,72 +1,62 @@
-/* $Id: thread_pool_observer.hpp,v 1.4 2005-10-15 14:09:09 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
-%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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #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;
-        virtual void result() = 0;
+        virtual void result(const char *info) = 0;
         virtual ~IThreadPoolMsg();
+        virtual bool cleanup(void *info) = 0;
     };
 
     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);
+        void cleanup(IThreadPoolMsg *m, void *info);
         IThreadPoolMsg *get();
         void run(void *p);
-        int m_fd[2];
+        void get_thread_info(int &tbusy, int &total);
     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
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */