X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fthread_pool_observer.cpp;h=bf60e7362be6f6cf2855aef41d8b246099b8c1ac;hb=bf357542a6cc1b8b1a04274803716c9f28f13d57;hp=40323d90dcdb401b44af0d328e8c0070ffe5cfc5;hpb=5ed8cae5f8518ca4502a51f3884b323f4dbd744a;p=metaproxy-moved-to-github.git diff --git a/src/thread_pool_observer.cpp b/src/thread_pool_observer.cpp index 40323d9..bf60e73 100644 --- a/src/thread_pool_observer.cpp +++ b/src/thread_pool_observer.cpp @@ -1,71 +1,129 @@ -/* $Id: thread_pool_observer.cpp,v 1.6 2005-10-14 10:27:18 adam Exp $ - Copyright (c) 1998-2005, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 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 + +#ifdef WIN32 +#include +#include +#endif +#include +#include +#include + #include #include -#include +#include +#include + +#include #include -#include "config.hpp" #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; + unsigned m_min_threads; + unsigned m_max_threads; + unsigned m_waiting_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, + unsigned min_threads, unsigned max_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; - int i; - for (i = 0; im_stop_flag = false; + m_p->m_min_threads = m_p->m_no_threads = min_threads; + m_p->m_max_threads = max_threads; + m_p->m_waiting_threads = 0; + unsigned i; + for (i = 0; i < m_p->m_no_threads; i++) { Worker w(this); - m_thrds.add_thread(new boost::thread(w)); + m_p->m_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); - - close(m_fd[0]); - close(m_fd[1]); + m_p->m_thrds.join_all(); + m_p->m_socketObservable->deleteObserver(this); } void ThreadPoolSocketObserver::socketNotify(int event) @@ -73,51 +131,125 @@ 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 + 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_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(); + { + std::ostringstream os; + { + boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data); + os << "tbusy/total " << + m_p->m_no_threads - m_p->m_waiting_threads << + "/" << m_p->m_no_threads + << " queue in/out " << m_p->m_input.size() << "/" + << m_p->m_output.size(); + } + out->result(os.str().c_str()); + } } } +void ThreadPoolSocketObserver::get_thread_info(int &tbusy, int &total) +{ + tbusy = m_p->m_no_threads - m_p->m_waiting_threads; + total = m_p->m_no_threads; +} + void ThreadPoolSocketObserver::run(void *p) { while(1) { 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); + m_p->m_waiting_threads++; + while (!m_p->m_stop_flag && m_p->m_input.size() == 0) + m_p->m_cond_input_data.wait(input_lock); + m_p->m_waiting_threads--; + 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 + 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::cleanup(IThreadPoolMsg *m, void *info) +{ + boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data); + + std::deque::iterator it = m_p->m_input.begin(); + while (it != m_p->m_input.end()) + { + if ((*it)->cleanup(info)) + { + delete *it; + it = m_p->m_input.erase(it); + } + else + it++; + } +} + 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); + if (m_p->m_waiting_threads == 0 && + m_p->m_no_threads < m_p->m_max_threads) + { + m_p->m_no_threads++; + Worker w(this); + m_p->m_thrds.add_thread(new boost::thread(w)); + } + 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