Merge branch 'mp-629'

diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp
index 6607a1e..7d6b422 100644 (file)
--- a/src/filter_frontend_net.cpp
+++ b/src/filter_frontend_net.cpp
@@ -55,6 +55,8 @@ namespace metaproxy_1 {
             friend class FrontendNet;
 
             int m_no_threads;
+            int m_max_threads;
+            int m_stack_size;
             std::vector<Port> m_ports;
             int m_listen_duration;
             int m_session_timeout;
@@ -524,7 +526,8 @@ yf::FrontendNet::FrontendNet() : m_p(new Rep)
 
 yf::FrontendNet::Rep::Rep()
 {
-    m_no_threads = 5;
+    m_max_threads = m_no_threads = 5;
+    m_stack_size = 0;
     m_listen_duration = 0;
     m_session_timeout = 300; // 5 minutes
     m_connect_max = 0;
@@ -614,7 +617,9 @@ void yf::FrontendNet::process(mp::Package &package) const
         tt = new My_Timer_Thread(&m_p->mySocketManager,
                                  m_p->m_listen_duration);
 
-    ThreadPoolSocketObserver tp(&m_p->mySocketManager, m_p->m_no_threads);
+    ThreadPoolSocketObserver tp(&m_p->mySocketManager, m_p->m_no_threads,
+                                m_p->m_max_threads,
+                                m_p->m_stack_size);
 
     for (i = 0; i<m_p->m_ports.size(); i++)
     {
@@ -703,6 +708,24 @@ void yf::FrontendNet::configure(const xmlNode * ptr, bool test_only,
                                                    + threads_str);
             m_p->m_no_threads = threads;
         }
+        else if (!strcmp((const char *) ptr->name, "max-threads"))
+        {
+            std::string threads_str = mp::xml::get_text(ptr);
+            int threads = atoi(threads_str.c_str());
+            if (threads < 1)
+                throw yf::FilterException("Bad value for max-threads: "
+                                                   + threads_str);
+            m_p->m_max_threads = threads;
+        }
+        else if (!strcmp((const char *) ptr->name, "stack-size"))
+        {
+            std::string sz_str = mp::xml::get_text(ptr);
+            int sz = atoi(sz_str.c_str());
+            if (sz < 0)
+                throw yf::FilterException("Bad value for stack-size: "
+                                                   + sz_str);
+            m_p->m_stack_size = sz * 1024;
+        }
         else if (!strcmp((const char *) ptr->name, "timeout"))
         {
             std::string timeout_str = mp::xml::get_text(ptr);

diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp
index 3b2fe9a..8df5b22 100644 (file)
--- a/src/test_thread_pool_observer.cpp
+++ b/src/test_thread_pool_observer.cpp
@@ -61,14 +61,9 @@ public:
 
 mp::IThreadPoolMsg *My_Msg::handle()
 {
-    My_Msg *res = new My_Msg;
-
     if (m_val == 7)
         sleep(1);
-
-    res->m_val = m_val;
-    res->m_timer = m_timer;
-    return res;
+    return this;
 }
 
 bool My_Msg::cleanup(void *info)
@@ -80,6 +75,7 @@ void My_Msg::result(const char *t_info)
 {
     m_timer->m_sum += m_val;
     m_timer->m_responses++;
+    delete this;
 }
 
 My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
@@ -97,26 +93,24 @@ My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
 
 void My_Timer_Thread::socketNotify(int event)
 {
-    My_Msg *m = new My_Msg;
-    m->m_val = m_requests++;
-    m->m_timer = this;
-    m_t->put(m);
-#if 0
-    // prevent input queue from being filled up..
-    // bug #1064: Test test_thread_pool_observer hangs
-    // fortunately we don't need this hack. because put (ebove)
-    // will block itself if needed
-    if (m->m_val == 30)
+    if (m_requests == 30)
          m_obs->deleteObserver(this);
-#endif
+    else
+    {
+        My_Msg *m = new My_Msg;
+        m->m_val = m_requests++;
+        m->m_timer = this;
+        m_t->put(m);
+    }
 }
 
 BOOST_AUTO_TEST_CASE( thread_pool_observer1 )
 {
     SocketManager mySocketManager;
 
-    mp::ThreadPoolSocketObserver m(&mySocketManager, 3);
-    My_Timer_Thread t(&mySocketManager, &m) ;
+    mp::ThreadPoolSocketObserver m(&mySocketManager, 3, 3, 16*1024);
+    My_Timer_Thread t(&mySocketManager, &m);
+
     while (t.m_responses < 30 && mySocketManager.processEvent() > 0)
         ;
     BOOST_CHECK_EQUAL(t.m_responses, 30);

diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp
index a52cd92..f7d3e63 100644 (file)
--- a/src/thread_pool_observer.cpp
+++ b/src/thread_pool_observer.cpp
@@ -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,20 +97,30 @@ 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++)
+    m_p->m_min_threads = m_p->m_no_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);
-        m_p->m_thrds.add_thread(new boost::thread(w));
+        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);
     }
 }
 
@@ -119,7 +132,6 @@ ThreadPoolSocketObserver::~ThreadPoolSocketObserver()
         m_p->m_cond_input_data.notify_all();
     }
     m_p->m_thrds.join_all();
-
     m_p->m_socketObservable->deleteObserver(this);
 }
 
@@ -148,15 +160,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();
@@ -168,7 +178,7 @@ void ThreadPoolSocketObserver::socketNotify(int event)
 
 void ThreadPoolSocketObserver::get_thread_info(int &tbusy, int &total)
 {
-    tbusy = m_p->m_no_threads - m_p->m_no_threads_waiting;
+    tbusy = m_p->m_no_threads - m_p->m_waiting_threads;
     total = m_p->m_no_threads;
 }
 
@@ -179,10 +189,10 @@ 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;
 
@@ -232,7 +242,19 @@ 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)
+    {
+        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);
+    }
     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);

diff --git a/src/thread_pool_observer.hpp b/src/thread_pool_observer.hpp
index 630b39b..8d59897 100644 (file)
--- a/src/thread_pool_observer.hpp
+++ b/src/thread_pool_observer.hpp
@@ -38,7 +38,8 @@ namespace metaproxy_1 {
         class Worker;
     public:
         ThreadPoolSocketObserver(yazpp_1::ISocketObservable *obs,
-                                 int no_threads);
+                                 unsigned min_threads, unsigned max_threads,
+                                 unsigned stack_size);
         virtual ~ThreadPoolSocketObserver();
         void put(IThreadPoolMsg *m);
         void cleanup(IThreadPoolMsg *m, void *info);

diff --git a/xml/schema/filter_frontend_net.rnc b/xml/schema/filter_frontend_net.rnc
index 1776c47..4e32ccd 100644 (file)
--- a/xml/schema/filter_frontend_net.rnc
+++ b/xml/schema/filter_frontend_net.rnc
@@ -7,6 +7,8 @@ filter_frontend_net =
   attribute id { xsd:NCName }?,
   attribute name { xsd:NCName }?,
   element mp:threads { xsd:integer }?,
+  element mp:max-threads { xsd:integer }?,
+  element mp:stack-size { xsd:integer }?,
   element mp:port {
     attribute route { xsd:NCName }?,
     attribute max_recv_bytes { xsd:integer }?,