+/* This file is part of Metaproxy.
+ Copyright (C) 2005-2010 Index Data
-/* $Id: thread_pool_observer.cpp,v 1.11 2005-11-07 21:57:10 adam Exp $
- Copyright (c) 2005, Index Data.
+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.
+
+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
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
-%LICENSE%
- */
#include "config.hpp"
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef WIN32
-#include <winsock.h>
-#endif
#include <boost/thread/thread.hpp>
#include <boost/thread/mutex.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 metaproxy_1 {
class ThreadPoolSocketObserver::Worker {
public:
Worker(ThreadPoolSocketObserver *s) : m_s(s) {};
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;
- int m_no_threads;
+ unsigned m_no_threads;
};
+ const unsigned int queue_size_per_thread = 64;
}
+
using namespace yazpp_1;
-using namespace yp2;
+using namespace metaproxy_1;
-ThreadPoolSocketObserver::Rep::Rep(ISocketObservable *obs)
+ThreadPoolSocketObserver::Rep::Rep(yazpp_1::ISocketObservable *obs)
: m_socketObservable(obs), m_pipe(9123)
{
}
}
-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);
if (event & SOCKET_OBSERVE_READ)
{
char buf[2];
- read(m_p->m_pipe.read_fd(), buf, 1);
+#ifdef WIN32
+ recv(m_p->m_pipe.read_fd(), buf, 1, 0);
+#else
+ ssize_t r = read(m_p->m_pipe.read_fd(), buf, 1);
+ if (r != 1)
+ {
+ if (r == (ssize_t) (-1))
+ yaz_log(YLOG_WARN|YLOG_ERRNO,
+ "ThreadPoolSocketObserver::socketNotify. read fail");
+ else
+ yaz_log(YLOG_WARN,
+ "ThreadPoolSocketObserver::socketNotify. read returned 0");
+ }
+#endif
IThreadPoolMsg *out;
{
boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
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);
- write(m_p->m_pipe.write_fd(), "", 1);
+#ifdef WIN32
+ send(m_p->m_pipe.write_fd(), "", 1, 0);
+#else
+ ssize_t r = write(m_p->m_pipe.write_fd(), "", 1);
+ if (r != 1)
+ {
+ if (r == (ssize_t) (-1))
+ yaz_log(YLOG_WARN|YLOG_ERRNO,
+ "ThreadPoolSocketObserver::run. write fail");
+ else
+ yaz_log(YLOG_WARN,
+ "ThreadPoolSocketObserver::run. write returned 0");
+ }
+#endif
}
}
}
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();
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/