Allow stack-size to be set for ThreadPoolSocketObserver

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

diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp
index 10ea2ad..8df5b22 100644 (file)
--- a/src/test_thread_pool_observer.cpp
+++ b/src/test_thread_pool_observer.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_thread_pool_observer.cpp,v 1.14 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   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
@@ -14,10 +12,9 @@ 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 Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 #include <stdlib.h>
@@ -30,6 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "thread_pool_observer.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
@@ -41,7 +39,8 @@ class My_Timer_Thread;
 class My_Msg : public mp::IThreadPoolMsg {
 public:
     mp::IThreadPoolMsg *handle();
-    void result();
+    void result(const char *t_info);
+    bool cleanup(void *info);
     int m_val;
     My_Timer_Thread *m_timer;
 };
@@ -62,25 +61,26 @@ public:
 
 mp::IThreadPoolMsg *My_Msg::handle()
 {
-    My_Msg *res = new My_Msg;
-
     if (m_val == 7)
         sleep(1);
+    return this;
+}
 
-    res->m_val = m_val;
-    res->m_timer = m_timer;
-    return res;
+bool My_Msg::cleanup(void *info)
+{
+    return false;
 }
 
-void My_Msg::result()
+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,
-                                 mp::ThreadPoolSocketObserver *t) : 
-    m_obs(obs), m_pipe(9123) 
+                                 mp::ThreadPoolSocketObserver *t) :
+    m_obs(obs), m_pipe(9123)
 {
     m_t = t;
     m_sum = 0;
@@ -93,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_UNIT_TEST( thread_pool_observer1 ) 
+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);
@@ -122,8 +120,8 @@ BOOST_AUTO_UNIT_TEST( thread_pool_observer1 )
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */