X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_thread_pool_observer.cpp;h=8df5b22e46e175f09792daf96e761fe3b177d4ea;hb=HEAD;hp=8086d2c885aa9985fca56eca38f0000417b2a7f2;hpb=9c480b66660e691cd0dc5ed869c1d902250dd674;p=metaproxy-moved-to-github.git

diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp
index 8086d2c..8df5b22 100644
--- a/src/test_thread_pool_observer.cpp
+++ b/src/test_thread_pool_observer.cpp
@@ -1,45 +1,46 @@
-/* $Id: test_thread_pool_observer.cpp,v 1.3 2005-10-12 23:30:43 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
-This file is part of the yaz-proxy.
-
-YAZ proxy is free software; you can redistribute it and/or modify it under
+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
 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
+Metaproxy 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.
- */
+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>
 #include <ctype.h>
 
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
 #include <yaz/log.h>
-#include "thread_pool_observer.h"
+#include "pipe.hpp"
+#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;
 using namespace yazpp_1;
+namespace mp = metaproxy_1;
 
 class My_Timer_Thread;
 
-class My_Msg : public IThreadPoolMsg {
+class My_Msg : public mp::IThreadPoolMsg {
 public:
-    IThreadPoolMsg *handle();
-    void result();
+    mp::IThreadPoolMsg *handle();
+    void result(const char *t_info);
+    bool cleanup(void *info);
     int m_val;
     My_Timer_Thread *m_timer;
 };
@@ -47,71 +48,79 @@ public:
 class My_Timer_Thread : public ISocketObserver {
 private:
     ISocketObservable *m_obs;
-    int m_fd[2];
-    ThreadPoolSocketObserver *m_t;
+    mp::Pipe m_pipe;
+    mp::ThreadPoolSocketObserver *m_t;
 public:
     int m_sum;
     int m_requests;
     int m_responses;
-    My_Timer_Thread(ISocketObservable *obs, ThreadPoolSocketObserver *t);
+    My_Timer_Thread(ISocketObservable *obs, mp::ThreadPoolSocketObserver *t);
     void socketNotify(int event);
 };
 
 
-IThreadPoolMsg *My_Msg::handle()
+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,
-                                 ThreadPoolSocketObserver *t) : m_obs(obs) 
+                                 mp::ThreadPoolSocketObserver *t) :
+    m_obs(obs), m_pipe(9123)
 {
-    pipe(m_fd);
     m_t = t;
     m_sum = 0;
     m_requests = 0;
     m_responses = 0;
-    obs->addObserver(m_fd[0], this);
+    obs->addObserver(m_pipe.read_fd(), this);
     obs->maskObserver(this, SOCKET_OBSERVE_READ);
     obs->timeoutObserver(this, 0);
 }
 
 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 (m_requests == 30)
+         m_obs->deleteObserver(this);
+    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 ) 
+BOOST_AUTO_TEST_CASE( thread_pool_observer1 )
 {
     SocketManager mySocketManager;
 
-    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);
-    BOOST_CHECK(t.m_sum >= 435);
+    BOOST_CHECK(t.m_sum >= 435); // = 29*30/2
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab