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
http_rewrite: rename Section -> Phase
[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
..
3203e77
100644
(file)
--- a/
src/test_thread_pool_observer.cpp
+++ b/
src/test_thread_pool_observer.cpp
@@
-1,50
+1,46
@@
-/* $Id: test_thread_pool_observer.cpp,v 1.6 2005-10-15 14:09:09 adam Exp $
- Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+ Copyright (C) 2005-2013 Index Data
-%LICENSE%
- */
-/* $Id: test_thread_pool_observer.cpp,v 1.6 2005-10-15 14:09:09 adam Exp $
- Copyright (c) 1998-2005, 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.
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
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 "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 <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
+#define BOOST_TEST_DYN_LINK
#include <boost/test/auto_unit_test.hpp>
using namespace boost::unit_test;
using namespace yazpp_1;
#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_Timer_Thread;
-class My_Msg : public yp2::IThreadPoolMsg {
+class My_Msg : public mp::IThreadPoolMsg {
public:
public:
- yp2::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;
};
int m_val;
My_Timer_Thread *m_timer;
};
@@
-52,18
+48,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;
@@
-75,21
+71,26
@@
yp2::IThreadPoolMsg *My_Msg::handle()
return res;
}
return res;
}
-void My_Msg::result()
+bool My_Msg::cleanup(void *info)
+{
+ return false;
+}
+
+void My_Msg::result(const char *t_info)
{
m_timer->m_sum += m_val;
m_timer->m_responses++;
}
My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
{
m_timer->m_sum += m_val;
m_timer->m_responses++;
}
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);
}
@@
-100,25
+101,33
@@
void My_Timer_Thread::socketNotify(int event)
m->m_val = m_requests++;
m->m_timer = this;
m_t->put(m);
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)
+ m_obs->deleteObserver(this);
+#endif
}
}
-BOOST_AUTO_TEST_CASE( thread_pool_observer1 )
+BOOST_AUTO_TEST_CASE( 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)
;
BOOST_CHECK_EQUAL(t.m_responses, 30);
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
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/