X-Git-Url: http://git.indexdata.com/?p=metaproxy-moved-to-github.git;a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;fp=src%2Fthread_pool_observer.cpp;h=c2a854f18c833e40b7004ca4392f0bd52e7de96d;hp=f7d3e63168b4d970495c7b8129017668020efee3;hb=a2327d00b64241d3de8e5a173535bf65d0eeffe7;hpb=ed1d79c860c13fb92e5b7eea8de2cd608a6caa0e

diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp
index f7d3e63..c2a854f 100644
--- a/src/thread_pool_observer.cpp
+++ b/src/thread_pool_observer.cpp
@@ -106,22 +106,14 @@ ThreadPoolSocketObserver::ThreadPoolSocketObserver(
     obs->maskObserver(this, SOCKET_OBSERVE_READ);
 
     m_p->m_stop_flag = false;
-    m_p->m_min_threads = m_p->m_no_threads = min_threads;
+    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 < m_p->m_no_threads; i++)
-    {
-        Worker w(this);
-        boost::thread::attributes attrs;
-        if (m_p->m_stack_size)
-            attrs.set_stack_size(m_p->m_stack_size);
-
-        boost::thread *x = new boost::thread(attrs, w);
-
-        m_p->m_thrds.add_thread(x);
-    }
+    for (i = 0; i < min_threads; i++)
+        add_worker();
 }
 
 ThreadPoolSocketObserver::~ThreadPoolSocketObserver()
@@ -135,6 +127,21 @@ ThreadPoolSocketObserver::~ThreadPoolSocketObserver()
     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)
@@ -245,15 +252,7 @@ void ThreadPoolSocketObserver::put(IThreadPoolMsg *m)
     if (m_p->m_waiting_threads == 0 &&
         m_p->m_no_threads < m_p->m_max_threads)
     {
-        m_p->m_no_threads++;
-        Worker w(this);
-
-        boost::thread::attributes attrs;
-        if (m_p->m_stack_size)
-            attrs.set_stack_size(m_p->m_stack_size);
-        boost::thread *x = new boost::thread(attrs, w);
-
-        m_p->m_thrds.add_thread(x);
+        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);