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
Depend on yaz++ 1.0.3
[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
e87090c
..
ab72255
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.19 2007-02-19 12:51:08 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-/* $Id: thread_pool_observer.cpp,v 1.15 2006-03-29 13:44:45 adam Exp $
- Copyright (c) 2005-2006, Index Data.
-
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
*/
#include "config.hpp"
@@
-32,8
+31,6
@@
#include "thread_pool_observer.hpp"
#include "pipe.hpp"
#include "thread_pool_observer.hpp"
#include "pipe.hpp"
-namespace mp = metaproxy_1;
-
namespace metaproxy_1 {
class ThreadPoolSocketObserver::Worker {
public:
namespace metaproxy_1 {
class ThreadPoolSocketObserver::Worker {
public:
@@
-65,9
+62,9
@@
namespace metaproxy_1 {
using namespace yazpp_1;
using namespace yazpp_1;
-using namespace mp;
+using namespace metaproxy_1;
-ThreadPoolSocketObserver::Rep::Rep(ISocketObservable *obs)
+ThreadPoolSocketObserver::Rep::Rep(yazpp_1::ISocketObservable *obs)
: m_socketObservable(obs), m_pipe(9123)
{
}
: m_socketObservable(obs), m_pipe(9123)
{
}
@@
-81,8
+78,8
@@
IThreadPoolMsg::~IThreadPoolMsg()
}
}
-ThreadPoolSocketObserver::ThreadPoolSocketObserver(ISocketObservable *obs,
- int no_threads)
+ThreadPoolSocketObserver::ThreadPoolSocketObserver(
+ yazpp_1::ISocketObservable *obs, int no_threads)
: m_p(new Rep(obs))
{
obs->addObserver(m_p->m_pipe.read_fd(), this);
: m_p(new Rep(obs))
{
obs->addObserver(m_p->m_pipe.read_fd(), this);
@@
-115,7
+112,11
@@
void ThreadPoolSocketObserver::socketNotify(int event)
if (event & SOCKET_OBSERVE_READ)
{
char buf[2];
if (event & SOCKET_OBSERVE_READ)
{
char buf[2];
+#ifdef WIN32
recv(m_p->m_pipe.read_fd(), buf, 1, 0);
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);
@@
-146,7
+147,11
@@
void ThreadPoolSocketObserver::run(void *p)
{
boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
m_p->m_output.push_back(out);
{
boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
m_p->m_output.push_back(out);
+#ifdef WIN32
send(m_p->m_pipe.write_fd(), "", 1, 0);
send(m_p->m_pipe.write_fd(), "", 1, 0);
+#else
+ write(m_p->m_pipe.write_fd(), "", 1);
+#endif
}
}
}
}
}
}