std::string type() function taken out of all filter classes again

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

diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp
index 6a8f5cb..f400ba5 100644 (file)
--- a/src/thread_pool_observer.cpp
+++ b/src/thread_pool_observer.cpp
@@ -1,24 +1,8 @@
-/* $Id: thread_pool_observer.cpp,v 1.1 2005-10-06 19:33:58 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
+/* $Id: thread_pool_observer.cpp,v 1.7 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%
  */
-#include <pthread.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -26,23 +10,17 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz++/socket-observer.h>
 #include <yaz/log.h>
 
-#include "thread_pool_observer.h"
+#include "config.hpp"
+#include "thread_pool_observer.hpp"
 
 using namespace yazpp_1;
+using namespace yp2;
 
 IThreadPoolMsg::~IThreadPoolMsg()
 {
 
 }
 
-static void *tfunc(void *p)
-{
-    ThreadPoolSocketObserver *pt = (ThreadPoolSocketObserver *) p;
-    pt->run(0);
-    return 0;
-}
-
-
 ThreadPoolSocketObserver::ThreadPoolSocketObserver(ISocketObservable *obs, int no_threads)
     : m_SocketObservable(obs)
 {
@@ -51,34 +29,26 @@ ThreadPoolSocketObserver::ThreadPoolSocketObserver(ISocketObservable *obs, int n
     obs->maskObserver(this, SOCKET_OBSERVE_READ);
 
     m_stop_flag = false;
-    pthread_mutex_init(&m_mutex_input_data, 0);
-    pthread_cond_init(&m_cond_input_data, 0);
-    pthread_mutex_init(&m_mutex_output_data, 0);
-
     m_no_threads = no_threads;
-    m_thread_id = new pthread_t[no_threads];
     int i;
-    for (i = 0; i<m_no_threads; i++)
-        pthread_create(&m_thread_id[i], 0, tfunc, this);
+    for (i = 0; i<no_threads; i++)
+    {
+        Worker w(this);
+        m_thrds.add_thread(new boost::thread(w));
+    }
 }
 
 ThreadPoolSocketObserver::~ThreadPoolSocketObserver()
 {
-    pthread_mutex_lock(&m_mutex_input_data);
-    m_stop_flag = true;
-    pthread_cond_broadcast(&m_cond_input_data);
-    pthread_mutex_unlock(&m_mutex_input_data);
-    
-    int i;
-    for (i = 0; i<m_no_threads; i++)
-        pthread_join(m_thread_id[i], 0);
-    delete [] m_thread_id;
+    {
+        boost::mutex::scoped_lock input_lock(m_mutex_input_data);
+        m_stop_flag = true;
+        m_cond_input_data.notify_all();
+    }
+    m_thrds.join_all();
 
     m_SocketObservable->deleteObserver(this);
 
-    pthread_cond_destroy(&m_cond_input_data);
-    pthread_mutex_destroy(&m_mutex_input_data);
-    pthread_mutex_destroy(&m_mutex_output_data);
     close(m_fd[0]);
     close(m_fd[1]);
 }
@@ -89,10 +59,12 @@ void ThreadPoolSocketObserver::socketNotify(int event)
     {
         char buf[2];
         read(m_fd[0], buf, 1);
-        pthread_mutex_lock(&m_mutex_output_data);
-        IThreadPoolMsg *out = m_output.front();
-        m_output.pop_front();
-        pthread_mutex_unlock(&m_mutex_output_data);
+        IThreadPoolMsg *out;
+        {
+            boost::mutex::scoped_lock output_lock(m_mutex_output_data);
+            out = m_output.front();
+            m_output.pop_front();
+        }
         if (out)
             out->result();
     }
@@ -102,39 +74,37 @@ void ThreadPoolSocketObserver::run(void *p)
 {
     while(1)
     {
-        pthread_mutex_lock(&m_mutex_input_data);
-        while (!m_stop_flag && m_input.size() == 0)
-            pthread_cond_wait(&m_cond_input_data, &m_mutex_input_data);
-        if (m_stop_flag)
+        IThreadPoolMsg *in = 0;
         {
-            pthread_mutex_unlock(&m_mutex_input_data);
-            break;
+            boost::mutex::scoped_lock input_lock(m_mutex_input_data);
+            while (!m_stop_flag && m_input.size() == 0)
+                m_cond_input_data.wait(input_lock);
+            if (m_stop_flag)
+                break;
+            
+            in = m_input.front();
+            m_input.pop_front();
         }
-        IThreadPoolMsg *in = m_input.front();
-        m_input.pop_front();
-        pthread_mutex_unlock(&m_mutex_input_data);
-
         IThreadPoolMsg *out = in->handle();
-        pthread_mutex_lock(&m_mutex_output_data);
-
-        m_output.push_back(out);
-        
-        write(m_fd[1], "", 1);
-        pthread_mutex_unlock(&m_mutex_output_data);
+        {
+            boost::mutex::scoped_lock output_lock(m_mutex_output_data);
+            m_output.push_back(out);
+            write(m_fd[1], "", 1);
+        }
     }
 }
 
 void ThreadPoolSocketObserver::put(IThreadPoolMsg *m)
 {
-    pthread_mutex_lock(&m_mutex_input_data);
+    boost::mutex::scoped_lock input_lock(m_mutex_input_data);
     m_input.push_back(m);
-    pthread_cond_signal(&m_cond_input_data);
-    pthread_mutex_unlock(&m_mutex_input_data);
+    m_cond_input_data.notify_one();
 }
 /*
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */