the implementation of ThreadPoolSocketObserver.
-## $Id: Makefile.am,v 1.14 2005-10-12 20:45:56 marc Exp $
+## $Id: Makefile.am,v 1.15 2005-10-12 23:30:43 adam Exp $
MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
test_session2_LDADD = $(LDADD) -lboost_unit_test_framework
test_boost_threads_LDADD = $(LDADD) -lboost_unit_test_framework
test_boost_time_LDADD = $(LDADD) -lboost_unit_test_framework
-
-
-
+test_thread_pool_observer_LDADD = $(LDADD) -lboost_unit_test_framework
# doxygen target
dox:
-/* $Id: test_thread_pool_observer.cpp,v 1.2 2005-10-08 23:29:32 adam Exp $
+/* $Id: test_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.
#include <yaz/log.h>
#include "thread_pool_observer.h"
+#define BOOST_AUTO_TEST_MAIN
+#include <boost/test/auto_unit_test.hpp>
+
+using namespace boost::unit_test;
using namespace yazpp_1;
+class My_Timer_Thread;
+
class My_Msg : public IThreadPoolMsg {
public:
IThreadPoolMsg *handle();
void result();
int m_val;
+ My_Timer_Thread *m_timer;
};
+class My_Timer_Thread : public ISocketObserver {
+private:
+ ISocketObservable *m_obs;
+ int m_fd[2];
+ ThreadPoolSocketObserver *m_t;
+public:
+ int m_sum;
+ int m_requests;
+ int m_responses;
+ My_Timer_Thread(ISocketObservable *obs, ThreadPoolSocketObserver *t);
+ void socketNotify(int event);
+};
+
+
IThreadPoolMsg *My_Msg::handle()
{
My_Msg *res = new My_Msg;
- int sl = rand() % 5;
+
+ if (m_val == 7)
+ sleep(1);
res->m_val = m_val;
- printf("My_Msg::handle val=%d sleep=%d\n", m_val, sl);
- sleep(sl);
+ res->m_timer = m_timer;
return res;
}
void My_Msg::result()
{
- printf("My_Msg::result val=%d\n", m_val);
+ m_timer->m_sum += m_val;
+ m_timer->m_responses++;
}
-class My_Timer_Thread : public ISocketObserver {
-private:
- ISocketObservable *m_obs;
- int m_fd[2];
- ThreadPoolSocketObserver *m_t;
-public:
- My_Timer_Thread(ISocketObservable *obs, ThreadPoolSocketObserver *t);
- void socketNotify(int event);
-};
-
My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
ThreadPoolSocketObserver *t) : m_obs(obs)
{
pipe(m_fd);
m_t = t;
+ m_sum = 0;
+ m_requests = 0;
+ m_responses = 0;
obs->addObserver(m_fd[0], this);
obs->maskObserver(this, SOCKET_OBSERVE_READ);
- obs->timeoutObserver(this, 1);
+ obs->timeoutObserver(this, 0);
}
void My_Timer_Thread::socketNotify(int event)
{
- static int seq = 1;
- printf("Add %d\n", seq);
My_Msg *m = new My_Msg;
- m->m_val = seq++;
+ m->m_val = m_requests++;
+ m->m_timer = this;
m_t->put(m);
}
-int main(int argc, char **argv)
+BOOST_AUTO_TEST_CASE( thread_pool_observer1 )
{
SocketManager mySocketManager;
ThreadPoolSocketObserver m(&mySocketManager, 3);
My_Timer_Thread t(&mySocketManager, &m) ;
- int i = 0;
- while (++i < 5 && mySocketManager.processEvent() > 0)
+ while (t.m_responses < 30 && mySocketManager.processEvent() > 0)
;
- return 0;
+ BOOST_CHECK_EQUAL(t.m_responses, 30);
+ BOOST_CHECK(t.m_sum >= 435);
}
+
/*
* Local variables:
* c-basic-offset: 4
-/* $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:
-/* $Id: thread_pool_observer.h,v 1.1 2005-10-06 19:33:58 adam Exp $
+/* $Id: thread_pool_observer.h,v 1.2 2005-10-12 23:30:43 adam Exp $
Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
02111-1307, USA.
*/
-#include <pthread.h>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition.hpp>
+
#include <unistd.h>
#include <ctype.h>
private:
yazpp_1::ISocketObservable *m_SocketObservable;
int m_no_threads;
- pthread_t *m_thread_id;
+ boost::thread_group m_thrds;
std::deque<IThreadPoolMsg *> m_input;
std::deque<IThreadPoolMsg *> m_output;
- pthread_mutex_t m_mutex_input_data;
- pthread_cond_t m_cond_input_data;
- pthread_mutex_t m_mutex_output_data;
+
+ boost::mutex m_mutex_input_data;
+ boost::condition m_cond_input_data;
+ boost::mutex m_mutex_output_data;
bool m_stop_flag;
};
projects / metaproxy-moved-to-github.git / commitdiff