-/* $Id: thread_pool_observer.cpp,v 1.11 2005-11-07 21:57:10 adam Exp $
- Copyright (c) 2005, 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%
*/
#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 <deque>
-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>
#include <yaz/log.h>
#include "thread_pool_observer.hpp"
#include "pipe.hpp"
-namespace yp2 {
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1 {
class ThreadPoolSocketObserver::Worker {
public:
Worker(ThreadPoolSocketObserver *s) : m_s(s) {};
using namespace yazpp_1;
-using namespace yp2;
+using namespace mp;
ThreadPoolSocketObserver::Rep::Rep(ISocketObservable *obs)
: m_socketObservable(obs), m_pipe(9123)
if (event & SOCKET_OBSERVE_READ)
{
char buf[2];
- read(m_p->m_pipe.read_fd(), buf, 1);
+ recv(m_p->m_pipe.read_fd(), buf, 1, 0);
IThreadPoolMsg *out;
{
boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
{
boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
m_p->m_output.push_back(out);
- write(m_p->m_pipe.write_fd(), "", 1);
+ send(m_p->m_pipe.write_fd(), "", 1, 0);
}
}
}