X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;h=c2a854f18c833e40b7004ca4392f0bd52e7de96d;hb=HEAD;hp=ce372351b63c33f1dce625be64b60cb9504525c5;hpb=722c498e016a6eb94044c608a7d1dcb21e5013cd;p=metaproxy-moved-to-github.git

diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp
index ce37235..c2a854f 100644
--- a/src/thread_pool_observer.cpp
+++ b/src/thread_pool_observer.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2012 Index Data
+   Copyright (C) Index Data
 
 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
@@ -68,8 +68,11 @@ namespace metaproxy_1 {
         std::deque<IThreadPoolMsg *> m_input;
         std::deque<IThreadPoolMsg *> m_output;
         bool m_stop_flag;
+        unsigned m_stack_size;
         unsigned m_no_threads;
-        unsigned m_no_threads_waiting;
+        unsigned m_min_threads;
+        unsigned m_max_threads;
+        unsigned m_waiting_threads;
     };
     const unsigned int queue_size_per_thread = 64;
 }
@@ -94,21 +97,23 @@ IThreadPoolMsg::~IThreadPoolMsg()
 }
 
 ThreadPoolSocketObserver::ThreadPoolSocketObserver(
-    yazpp_1::ISocketObservable *obs, int no_threads)
+    yazpp_1::ISocketObservable *obs,
+    unsigned min_threads, unsigned max_threads,
+    unsigned stack_size)
     : m_p(new Rep(obs))
 {
     obs->addObserver(m_p->m_pipe.read_fd(), this);
     obs->maskObserver(this, SOCKET_OBSERVE_READ);
 
     m_p->m_stop_flag = false;
-    m_p->m_no_threads = no_threads;
-    m_p->m_no_threads_waiting = 0;
-    int i;
-    for (i = 0; i<no_threads; i++)
-    {
-        Worker w(this);
-        m_p->m_thrds.add_thread(new boost::thread(w));
-    }
+    m_p->m_no_threads = 0;
+    m_p->m_min_threads = min_threads;
+    m_p->m_max_threads = max_threads;
+    m_p->m_waiting_threads = 0;
+    m_p->m_stack_size = stack_size;
+    unsigned i;
+    for (i = 0; i < min_threads; i++)
+        add_worker();
 }
 
 ThreadPoolSocketObserver::~ThreadPoolSocketObserver()
@@ -119,10 +124,24 @@ ThreadPoolSocketObserver::~ThreadPoolSocketObserver()
         m_p->m_cond_input_data.notify_all();
     }
     m_p->m_thrds.join_all();
-
     m_p->m_socketObservable->deleteObserver(this);
 }
 
+void ThreadPoolSocketObserver::add_worker(void)
+{
+    Worker w(this);
+#if BOOST_VERSION >= 1050000
+    boost::thread::attributes attrs;
+    if (m_p->m_stack_size)
+        attrs.set_stack_size(m_stack_size);
+    boost::thread *x = new boost::thread(attrs, w);
+#else
+    boost::thread *x = new boost::thread(w);
+#endif
+    m_p->m_no_threads++;
+    m_p->m_thrds.add_thread(x);
+}
+
 void ThreadPoolSocketObserver::socketNotify(int event)
 {
     if (event & SOCKET_OBSERVE_READ)
@@ -148,15 +167,13 @@ void ThreadPoolSocketObserver::socketNotify(int event)
             out = m_p->m_output.front();
             m_p->m_output.pop_front();
         }
-
-
         if (out)
         {
             std::ostringstream os;
             {
                 boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data);
                 os  << "tbusy/total " <<
-                    m_p->m_no_threads - m_p->m_no_threads_waiting <<
+                    m_p->m_no_threads - m_p->m_waiting_threads <<
                     "/" << m_p->m_no_threads
                     << " queue in/out " << m_p->m_input.size() << "/"
                     << m_p->m_output.size();
@@ -166,6 +183,12 @@ void ThreadPoolSocketObserver::socketNotify(int event)
     }
 }
 
+void ThreadPoolSocketObserver::get_thread_info(int &tbusy, int &total)
+{
+    tbusy = m_p->m_no_threads - m_p->m_waiting_threads;
+    total = m_p->m_no_threads;
+}
+
 void ThreadPoolSocketObserver::run(void *p)
 {
     while(1)
@@ -173,15 +196,15 @@ void ThreadPoolSocketObserver::run(void *p)
         IThreadPoolMsg *in = 0;
         {
             boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data);
-            m_p->m_no_threads_waiting++;
+            m_p->m_waiting_threads++;
             while (!m_p->m_stop_flag && m_p->m_input.size() == 0)
                 m_p->m_cond_input_data.wait(input_lock);
-            m_p->m_no_threads_waiting--;
+            m_p->m_waiting_threads--;
             if (m_p->m_stop_flag)
                 break;
-            
+
             in = m_p->m_input.front();
-            m_p->m_input.pop_front(); 
+            m_p->m_input.pop_front();
             m_p->m_cond_input_full.notify_all();
         }
         IThreadPoolMsg *out = in->handle();
@@ -214,7 +237,10 @@ void ThreadPoolSocketObserver::cleanup(IThreadPoolMsg *m, void *info)
     while (it != m_p->m_input.end())
     {
         if ((*it)->cleanup(info))
+        {
+            delete *it;
             it = m_p->m_input.erase(it);
+        }
         else
             it++;
     }
@@ -223,7 +249,11 @@ void ThreadPoolSocketObserver::cleanup(IThreadPoolMsg *m, void *info)
 void ThreadPoolSocketObserver::put(IThreadPoolMsg *m)
 {
     boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data);
-
+    if (m_p->m_waiting_threads == 0 &&
+        m_p->m_no_threads < m_p->m_max_threads)
+    {
+        add_worker();
+    }
     while (m_p->m_input.size() >= m_p->m_no_threads * queue_size_per_thread)
         m_p->m_cond_input_full.wait(input_lock);
     m_p->m_input.push_back(m);