-/* $Id: thread_pool_observer.cpp,v 1.2 2005-10-08 23:29:32 adam Exp $
- Copyright (c) 1998-2005, Index Data.
-This file is part of the yaz-proxy.
+/* $Id: thread_pool_observer.cpp,v 1.16 2006-06-09 14:12:13 adam Exp $
+ Copyright (c) 2005-2006, Index Data.
-YAZ proxy 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
-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.
+%LICENSE%
*/
-#include <pthread.h>
+#include "config.hpp"
+
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef WIN32
+#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 <ctype.h>
#include <stdio.h>
-#include <yaz++/socket-observer.h>
+#include <deque>
+
+#include <yazpp/socket-observer.h>
#include <yaz/log.h>
-#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::mutex m_mutex_output_data;
+ std::deque<IThreadPoolMsg *> m_input;
+ std::deque<IThreadPoolMsg *> m_output;
+ bool m_stop_flag;
+ int m_no_threads;
+ };
+}
+
using namespace yazpp_1;
+using namespace metaproxy_1;
-IThreadPoolMsg::~IThreadPoolMsg()
+ThreadPoolSocketObserver::Rep::Rep(yazpp_1::ISocketObservable *obs)
+ : m_socketObservable(obs), m_pipe(9123)
{
-
}
-static void *tfunc(void *p)
+ThreadPoolSocketObserver::Rep::~Rep()
{
- ThreadPoolSocketObserver *pt = (ThreadPoolSocketObserver *) p;
- pt->run(0);
- return 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;
- pthread_mutex_init(&m_mutex_input_data, 0);
- pthread_cond_init(&m_cond_input_data, 0);
- pthread_mutex_init(&m_mutex_output_data, 0);
-
- m_no_threads = no_threads;
- m_thread_id = new pthread_t[no_threads];
+ m_p->m_stop_flag = false;
+ m_p->m_no_threads = no_threads;
int i;
- for (i = 0; i<m_no_threads; i++)
- pthread_create(&m_thread_id[i], 0, tfunc, this);
+ for (i = 0; i<no_threads; i++)
+ {
+ Worker w(this);
+ m_p->m_thrds.add_thread(new boost::thread(w));
+ }
}
ThreadPoolSocketObserver::~ThreadPoolSocketObserver()
{
- pthread_mutex_lock(&m_mutex_input_data);
- m_stop_flag = true;
- pthread_cond_broadcast(&m_cond_input_data);
- pthread_mutex_unlock(&m_mutex_input_data);
-
- int i;
- for (i = 0; i<m_no_threads; i++)
- pthread_join(m_thread_id[i], 0);
- delete [] m_thread_id;
-
- m_SocketObservable->deleteObserver(this);
+ {
+ 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_p->m_thrds.join_all();
- pthread_cond_destroy(&m_cond_input_data);
- pthread_mutex_destroy(&m_mutex_input_data);
- pthread_mutex_destroy(&m_mutex_output_data);
- close(m_fd[0]);
- close(m_fd[1]);
+ m_p->m_socketObservable->deleteObserver(this);
}
void ThreadPoolSocketObserver::socketNotify(int event)
if (event & SOCKET_OBSERVE_READ)
{
char buf[2];
- read(m_fd[0], buf, 1);
- pthread_mutex_lock(&m_mutex_output_data);
- IThreadPoolMsg *out = m_output.front();
- m_output.pop_front();
- pthread_mutex_unlock(&m_mutex_output_data);
+ recv(m_p->m_pipe.read_fd(), buf, 1, 0);
+ IThreadPoolMsg *out;
+ {
+ 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();
}
{
while(1)
{
- pthread_mutex_lock(&m_mutex_input_data);
- while (!m_stop_flag && m_input.size() == 0)
- pthread_cond_wait(&m_cond_input_data, &m_mutex_input_data);
- if (m_stop_flag)
+ IThreadPoolMsg *in = 0;
{
- pthread_mutex_unlock(&m_mutex_input_data);
- break;
+ 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_p->m_input.front();
+ m_p->m_input.pop_front();
}
- IThreadPoolMsg *in = m_input.front();
- m_input.pop_front();
- pthread_mutex_unlock(&m_mutex_input_data);
-
IThreadPoolMsg *out = in->handle();
- pthread_mutex_lock(&m_mutex_output_data);
-
- m_output.push_back(out);
-
- write(m_fd[1], "", 1);
- pthread_mutex_unlock(&m_mutex_output_data);
+ {
+ boost::mutex::scoped_lock output_lock(m_p->m_mutex_output_data);
+ m_p->m_output.push_back(out);
+ send(m_p->m_pipe.write_fd(), "", 1, 0);
+ }
}
}
void ThreadPoolSocketObserver::put(IThreadPoolMsg *m)
{
- pthread_mutex_lock(&m_mutex_input_data);
- m_input.push_back(m);
- pthread_cond_signal(&m_cond_input_data);
- pthread_mutex_unlock(&m_mutex_input_data);
+ boost::mutex::scoped_lock input_lock(m_p->m_mutex_input_data);
+ m_p->m_input.push_back(m);
+ m_p->m_cond_input_data.notify_one();
}
/*
* Local variables:
* c-basic-offset: 4
* indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
projects / metaproxy-moved-to-github.git / blobdiff