X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;h=f018bf9451f7163a694fde5043ee14c70fb7f916;hb=665559cbc22546e8df69be33a7d492294cab9fb1;hp=b66be7e912105c2bd66eb557c80d7d2314211414;hpb=9c480b66660e691cd0dc5ed869c1d902250dd674;p=metaproxy-moved-to-github.git diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp index b66be7e..f018bf9 100644 --- a/src/thread_pool_observer.cpp +++ b/src/thread_pool_observer.cpp @@ -1,79 +1,119 @@ -/* $Id: thread_pool_observer.cpp,v 1.3 2005-10-12 23:30:43 adam Exp $ - Copyright (c) 1998-2005, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2008 Index Data -This file is part of the yaz-proxy. - -YAZ proxy is free software; you can redistribute it and/or modify it under +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. -YAZ proxy is distributed in the hope that it will be useful, but WITHOUT ANY +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 YAZ proxy; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "config.hpp" + +#if HAVE_UNISTD_H #include +#endif + +#include +#include +#include + #include #include -#include +#include + +#include #include -#include "config.hpp" -#include "thread_pool_observer.h" +#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 metaproxy_1; -IThreadPoolMsg::~IThreadPoolMsg() +ThreadPoolSocketObserver::Rep::Rep(yazpp_1::ISocketObservable *obs) + : m_socketObservable(obs), m_pipe(9123) { +} +ThreadPoolSocketObserver::Rep::~Rep() +{ } -class worker { -public: - worker(ThreadPoolSocketObserver *s) : m_s(s) {}; - ThreadPoolSocketObserver *m_s; - void operator() (void) { - m_s->run(0); - } -}; +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_SocketObservable->deleteObserver(this); + m_p->m_thrds.join_all(); - close(m_fd[0]); - close(m_fd[1]); + m_p->m_socketObservable->deleteObserver(this); } void ThreadPoolSocketObserver::socketNotify(int event) @@ -81,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(); @@ -99,33 +143,41 @@ 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 * End: * vim: shiftwidth=4 tabstop=8 expandtab