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
061ec8f
..
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.16 2006-06-09 14:12:13 adam Exp $
- Copyright (c) 2005-2006, Index Data.
-
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
*/
#include "config.hpp"
@@
-113,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);
@@
-144,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
}
}
}
}
}
}