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
Fixed bug #1064: Test test_thread_pool_observer hangs.
[metaproxy-moved-to-github.git]
/
src
/
thread_pool_observer.cpp
diff --git
a/src/thread_pool_observer.cpp
b/src/thread_pool_observer.cpp
index
367c43a
..
36cf783
100644
(file)
--- a/
src/thread_pool_observer.cpp
+++ b/
src/thread_pool_observer.cpp
@@
-1,8
+1,7
@@
+/* $Id: thread_pool_observer.cpp,v 1.20 2007-04-18 12:06:59 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-/* $Id: thread_pool_observer.cpp,v 1.9 2005-11-04 11:06:52 adam Exp $
- Copyright (c) 2005, Index Data.
-
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
*/
#include "config.hpp"
@@
-13,6
+12,10
@@
#include <winsock.h>
#endif
#include <winsock.h>
#endif
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
#include <boost/thread/thread.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread/thread.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
@@
-20,12
+23,15
@@
#include <ctype.h>
#include <stdio.h>
#include <ctype.h>
#include <stdio.h>
-#include <yaz++/socket-observer.h>
+#include <deque>
+
+#include <yazpp/socket-observer.h>
#include <yaz/log.h>
#include "thread_pool_observer.hpp"
#include <yaz/log.h>
#include "thread_pool_observer.hpp"
+#include "pipe.hpp"
-namespace yp2 {
+namespace metaproxy_1 {
class ThreadPoolSocketObserver::Worker {
public:
Worker(ThreadPoolSocketObserver *s) : m_s(s) {};
class ThreadPoolSocketObserver::Worker {
public:
Worker(ThreadPoolSocketObserver *s) : m_s(s) {};
@@
-42,24
+48,27
@@
namespace yp2 {
~Rep();
private:
yazpp_1::ISocketObservable *m_socketObservable;
~Rep();
private:
yazpp_1::ISocketObservable *m_socketObservable;
- int m_fd[2];
+ Pipe m_pipe;
boost::thread_group m_thrds;
boost::mutex m_mutex_input_data;
boost::condition m_cond_input_data;
boost::thread_group m_thrds;
boost::mutex m_mutex_input_data;
boost::condition m_cond_input_data;
+ boost::condition m_cond_input_full;
boost::mutex m_mutex_output_data;
std::deque<IThreadPoolMsg *> m_input;
std::deque<IThreadPoolMsg *> m_output;
bool m_stop_flag;
boost::mutex m_mutex_output_data;
std::deque<IThreadPoolMsg *> m_input;
std::deque<IThreadPoolMsg *> m_output;
bool m_stop_flag;
- int m_no_threads;
+ unsigned m_no_threads;
};
};
+ const unsigned int queue_size_per_thread = 64;
}
}
+
using namespace yazpp_1;
using namespace yazpp_1;
-using namespace yp2;
+using namespace metaproxy_1;
-ThreadPoolSocketObserver::Rep::Rep(ISocketObservable *obs)
- : m_socketObservable(obs)
+ThreadPoolSocketObserver::Rep::Rep(yazpp_1::ISocketObservable *obs)
+ : m_socketObservable(obs), m_pipe(9123)
{
}
{
}
@@
-72,12
+81,11
@@
IThreadPoolMsg::~IThreadPoolMsg()
}
}
-ThreadPoolSocketObserver::ThreadPoolSocketObserver(ISocketObservable *obs,
- int no_threads)
+ThreadPoolSocketObserver::ThreadPoolSocketObserver(
+ yazpp_1::ISocketObservable *obs, int no_threads)
: m_p(new Rep(obs))
{
: m_p(new Rep(obs))
{
- pipe(m_p->m_fd);
- obs->addObserver(m_p->m_fd[0], this);
+ obs->addObserver(m_p->m_pipe.read_fd(), this);
obs->maskObserver(this, SOCKET_OBSERVE_READ);
m_p->m_stop_flag = false;
obs->maskObserver(this, SOCKET_OBSERVE_READ);
m_p->m_stop_flag = false;
@@
-100,9
+108,6
@@
ThreadPoolSocketObserver::~ThreadPoolSocketObserver()
m_p->m_thrds.join_all();
m_p->m_socketObservable->deleteObserver(this);
m_p->m_thrds.join_all();
m_p->m_socketObservable->deleteObserver(this);
-
- close(m_p->m_fd[0]);
- close(m_p->m_fd[1]);
}
void ThreadPoolSocketObserver::socketNotify(int event)
}
void ThreadPoolSocketObserver::socketNotify(int event)
@@
-110,7
+115,11
@@
void ThreadPoolSocketObserver::socketNotify(int event)
if (event & SOCKET_OBSERVE_READ)
{
char buf[2];
if (event & SOCKET_OBSERVE_READ)
{
char buf[2];
- read(m_p->m_fd[0], buf, 1);
+#ifdef WIN32
+ recv(m_p->m_pipe.read_fd(), buf, 1, 0);
+#else
+ read(m_p->m_pipe.read_fd(), buf, 1);
+#endif
IThreadPoolMsg *out;
{
boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
IThreadPoolMsg *out;
{
boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
@@
-135,13
+144,18
@@
void ThreadPoolSocketObserver::run(void *p)
break;
in = m_p->m_input.front();
break;
in = m_p->m_input.front();
- m_p->m_input.pop_front();
+ m_p->m_input.pop_front();
+ m_p->m_cond_input_full.notify_all();
}
IThreadPoolMsg *out = in->handle();
{
boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
m_p->m_output.push_back(out);
}
IThreadPoolMsg *out = in->handle();
{
boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
m_p->m_output.push_back(out);
- write(m_p->m_fd[1], "", 1);
+#ifdef WIN32
+ send(m_p->m_pipe.write_fd(), "", 1, 0);
+#else
+ write(m_p->m_pipe.write_fd(), "", 1);
+#endif
}
}
}
}
}
}
@@
-149,6
+163,8
@@
void ThreadPoolSocketObserver::run(void *p)
void ThreadPoolSocketObserver::put(IThreadPoolMsg *m)
{
boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data);
void ThreadPoolSocketObserver::put(IThreadPoolMsg *m)
{
boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data);
+ 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);
m_p->m_cond_input_data.notify_one();
}
m_p->m_input.push_back(m);
m_p->m_cond_input_data.notify_one();
}