X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;h=64ddc62c3b808ece51084ac53940cb7f0ee1ec75;hb=d0123337d70b0fb97b578cc57467bb94980f1014;hp=b37b604d9d0f5798f4f3522d19237798047e7fc6;hpb=016501ca2d40d21abe865a8833c918a7c50412e1;p=metaproxy-moved-to-github.git diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp index b37b604..64ddc62 100644 --- a/src/thread_pool_observer.cpp +++ b/src/thread_pool_observer.cpp @@ -1,64 +1,119 @@ +/* This file is part of Metaproxy. + Copyright (C) 2005-2009 Index Data -/* $Id: thread_pool_observer.cpp,v 1.8 2005-11-04 10:27:51 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 #endif -#ifdef WIN32 -#include -#endif + +#include +#include +#include #include #include -#include +#include + +#include #include #include "thread_pool_observer.hpp" +#include "pipe.hpp" + +namespace metaproxy_1 { + class ThreadPoolSocketObserver::Worker { + public: + Worker(ThreadPoolSocketObserver *s) : m_s(s) {}; + ThreadPoolSocketObserver *m_s; + void operator() (void) { + m_s->run(0); + } + }; + + class ThreadPoolSocketObserver::Rep : public boost::noncopyable { + friend class ThreadPoolSocketObserver; + public: + Rep(yazpp_1::ISocketObservable *obs); + ~Rep(); + private: + yazpp_1::ISocketObservable *m_socketObservable; + Pipe m_pipe; + 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 m_input; + std::deque m_output; + bool m_stop_flag; + 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(yazpp_1::ISocketObservable *obs) + : m_socketObservable(obs), m_pipe(9123) +{ +} + +ThreadPoolSocketObserver::Rep::~Rep() +{ +} IThreadPoolMsg::~IThreadPoolMsg() { } -ThreadPoolSocketObserver::ThreadPoolSocketObserver(ISocketObservable *obs, int no_threads) - : m_SocketObservable(obs) +ThreadPoolSocketObserver::ThreadPoolSocketObserver( + yazpp_1::ISocketObservable *obs, int no_threads) + : m_p(new Rep(obs)) { - pipe(m_fd); - obs->addObserver(m_fd[0], this); + obs->addObserver(m_p->m_pipe.read_fd(), this); obs->maskObserver(this, SOCKET_OBSERVE_READ); - m_stop_flag = false; - m_no_threads = no_threads; + m_p->m_stop_flag = false; + m_p->m_no_threads = no_threads; int i; for (i = 0; im_thrds.add_thread(new boost::thread(w)); } } ThreadPoolSocketObserver::~ThreadPoolSocketObserver() { { - boost::mutex::scoped_lock input_lock(m_mutex_input_data); - m_stop_flag = true; - m_cond_input_data.notify_all(); + boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data); + m_p->m_stop_flag = true; + m_p->m_cond_input_data.notify_all(); } - m_thrds.join_all(); + m_p->m_thrds.join_all(); - m_SocketObservable->deleteObserver(this); - - close(m_fd[0]); - close(m_fd[1]); + m_p->m_socketObservable->deleteObserver(this); } void ThreadPoolSocketObserver::socketNotify(int event) @@ -66,12 +121,16 @@ void ThreadPoolSocketObserver::socketNotify(int event) if (event & SOCKET_OBSERVE_READ) { char buf[2]; - read(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_mutex_output_data); - out = m_output.front(); - m_output.pop_front(); + boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data); + out = m_p->m_output.front(); + m_p->m_output.pop_front(); } if (out) out->result(); @@ -84,35 +143,42 @@ void ThreadPoolSocketObserver::run(void *p) { IThreadPoolMsg *in = 0; { - boost::mutex::scoped_lock input_lock(m_mutex_input_data); - while (!m_stop_flag && m_input.size() == 0) - m_cond_input_data.wait(input_lock); - if (m_stop_flag) + boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data); + while (!m_p->m_stop_flag && m_p->m_input.size() == 0) + m_p->m_cond_input_data.wait(input_lock); + if (m_p->m_stop_flag) break; - in = m_input.front(); - m_input.pop_front(); + in = m_p->m_input.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_mutex_output_data); - m_output.push_back(out); - write(m_fd[1], "", 1); + 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); +#else + write(m_p->m_pipe.write_fd(), "", 1); +#endif } } } void ThreadPoolSocketObserver::put(IThreadPoolMsg *m) { - boost::mutex::scoped_lock input_lock(m_mutex_input_data); - m_input.push_back(m); - m_cond_input_data.notify_one(); + 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 */