Same header and footer for all files. Header includes copyright +

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

diff --git a/src/thread_pool_observer.hpp b/src/thread_pool_observer.hpp
index 0ff7a50..c09eba4 100644 (file)
--- a/src/thread_pool_observer.hpp
+++ b/src/thread_pool_observer.hpp
@@ -1,22 +1,7 @@
-/* $Id: thread_pool_observer.hpp,v 1.1 2005-10-13 20:06:45 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
+/* $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 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.
+%LICENSE%
  */
 
 #ifndef YP2_THREAD_POOL_OBSERVER_HPP
@@ -33,41 +18,55 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz++/socket-observer.h>
 #include <yaz/yconfig.h>
 
-class IThreadPoolMsg {
-public:
-    virtual IThreadPoolMsg *handle() = 0;
-    virtual void result() = 0;
-    virtual ~IThreadPoolMsg();
-};
+namespace yp2 {
+    class IThreadPoolMsg {
+    public:
+        virtual IThreadPoolMsg *handle() = 0;
+        virtual void result() = 0;
+        virtual ~IThreadPoolMsg();
+    };
 
-class ThreadPoolSocketObserver : public yazpp_1::ISocketObserver {
- 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;
+    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);
+            }
+        };
+    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;
+        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;
-};
+        boost::mutex m_mutex_input_data;
+        boost::condition m_cond_input_data;
+        boost::mutex m_mutex_output_data;
+        bool m_stop_flag;
 
+    
+    };
+}
 #endif
 /*
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */