projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation now based on Docbook XML/XSLT using xsltproc + Norman Walsh's
[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
38b4116
..
799a8d1
100644
(file)
--- a/
src/test_thread_pool_observer.cpp
+++ b/
src/test_thread_pool_observer.cpp
@@
-1,10
+1,10
@@
-/* $Id: test_thread_pool_observer.cpp,v 1.6 2005-10-15 14:09:09 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: test_thread_pool_observer.cpp,v 1.10 2006-03-29 13:44:45 adam Exp $
+ Copyright (c) 2005-2006, Index Data.
%LICENSE%
*/
%LICENSE%
*/
-/* $Id: test_thread_pool_observer.cpp,v 1.6 2005-10-15 14:09:09 adam Exp $
- Copyright (c) 1998-2005, Index Data.
+/* $Id: test_thread_pool_observer.cpp,v 1.10 2006-03-29 13:44:45 adam Exp $
+ Copyright (c) 1998-2005-2006, Index Data.
This file is part of the yaz-proxy.
This file is part of the yaz-proxy.
@@
-28,9
+28,10
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <ctype.h>
#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 <yaz/log.h>
+#include "pipe.hpp"
#include "thread_pool_observer.hpp"
#define BOOST_AUTO_TEST_MAIN
#include "thread_pool_observer.hpp"
#define BOOST_AUTO_TEST_MAIN
@@
-38,12
+39,13
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
using namespace boost::unit_test;
using namespace yazpp_1;
using namespace boost::unit_test;
using namespace yazpp_1;
+namespace mp = metaproxy_1;
class My_Timer_Thread;
class My_Timer_Thread;
-class My_Msg : public yp2::IThreadPoolMsg {
+class My_Msg : public mp::IThreadPoolMsg {
public:
public:
- yp2::IThreadPoolMsg *handle();
+ mp::IThreadPoolMsg *handle();
void result();
int m_val;
My_Timer_Thread *m_timer;
void result();
int m_val;
My_Timer_Thread *m_timer;
@@
-52,18
+54,18
@@
public:
class My_Timer_Thread : public ISocketObserver {
private:
ISocketObservable *m_obs;
class My_Timer_Thread : public ISocketObserver {
private:
ISocketObservable *m_obs;
- int m_fd[2];
- yp2::ThreadPoolSocketObserver *m_t;
+ mp::Pipe m_pipe;
+ mp::ThreadPoolSocketObserver *m_t;
public:
int m_sum;
int m_requests;
int m_responses;
public:
int m_sum;
int m_requests;
int m_responses;
- My_Timer_Thread(ISocketObservable *obs, yp2::ThreadPoolSocketObserver *t);
+ My_Timer_Thread(ISocketObservable *obs, mp::ThreadPoolSocketObserver *t);
void socketNotify(int event);
};
void socketNotify(int event);
};
-yp2::IThreadPoolMsg *My_Msg::handle()
+mp::IThreadPoolMsg *My_Msg::handle()
{
My_Msg *res = new My_Msg;
{
My_Msg *res = new My_Msg;
@@
-82,14
+84,14
@@
void My_Msg::result()
}
My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
}
My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
- yp2::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;
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);
}
obs->maskObserver(this, SOCKET_OBSERVE_READ);
obs->timeoutObserver(this, 0);
}
@@
-102,11
+104,11
@@
void My_Timer_Thread::socketNotify(int event)
m_t->put(m);
}
m_t->put(m);
}
-BOOST_AUTO_TEST_CASE( thread_pool_observer1 )
+BOOST_AUTO_UNIT_TEST( thread_pool_observer1 )
{
SocketManager mySocketManager;
{
SocketManager mySocketManager;
- yp2::ThreadPoolSocketObserver m(&mySocketManager, 3);
+ mp::ThreadPoolSocketObserver m(&mySocketManager, 3);
My_Timer_Thread t(&mySocketManager, &m) ;
while (t.m_responses < 30 && mySocketManager.processEvent() > 0)
;
My_Timer_Thread t(&mySocketManager, &m) ;
while (t.m_responses < 30 && mySocketManager.processEvent() > 0)
;