-/* $Id: thread_pool_observer.cpp,v 1.2 2005-10-08 23:29:32 adam Exp $
+/* $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 the yaz-proxy.
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
-#include <pthread.h>
#include <unistd.h>
#include <ctype.h>
#include <stdio.h>
}
-static void *tfunc(void *p)
-{
- ThreadPoolSocketObserver *pt = (ThreadPoolSocketObserver *) p;
- pt->run(0);
- return 0;
-}
-
+class worker {
+public:
+ worker(ThreadPoolSocketObserver *s) : m_s(s) {};
+ ThreadPoolSocketObserver *m_s;
+ void operator() (void) {
+ m_s->run(0);
+ }
+};
ThreadPoolSocketObserver::ThreadPoolSocketObserver(ISocketObservable *obs, int no_threads)
: m_SocketObservable(obs)
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];
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_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;
+ {
+ boost::mutex::scoped_lock input_lock(m_mutex_input_data);
+ m_stop_flag = true;
+ m_cond_input_data.notify_all();
+ }
+ m_thrds.join_all();
m_SocketObservable->deleteObserver(this);
- 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]);
}
{
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);
+ IThreadPoolMsg *out;
+ {
+ boost::mutex::scoped_lock output_lock(m_mutex_output_data);
+ out = m_output.front();
+ 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_mutex_input_data);
+ while (!m_stop_flag && m_input.size() == 0)
+ m_cond_input_data.wait(input_lock);
+ if (m_stop_flag)
+ break;
+
+ in = m_input.front();
+ 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_mutex_output_data);
+ m_output.push_back(out);
+ write(m_fd[1], "", 1);
+ }
}
}
void ThreadPoolSocketObserver::put(IThreadPoolMsg *m)
{
- pthread_mutex_lock(&m_mutex_input_data);
+ boost::mutex::scoped_lock input_lock(m_mutex_input_data);
m_input.push_back(m);
- pthread_cond_signal(&m_cond_input_data);
- pthread_mutex_unlock(&m_mutex_input_data);
+ m_cond_input_data.notify_one();
}
/*
* Local variables: