Cosmetic improvements.

[invirt/third/libt4.git] / rpc / thr_pool.cc

diff --git a/rpc/thr_pool.cc b/rpc/thr_pool.cc
index f9f32fa..fc7be3d 100644 (file)
--- a/rpc/thr_pool.cc
+++ b/rpc/thr_pool.cc
@@ -1,69 +1,33 @@
-#include "slock.h"
 #include "thr_pool.h"
-#include <stdlib.h>
-#include <errno.h>
-#include "lang/verify.h"
 
-static void *
-do_worker(void *arg)
-{
-       ThrPool *tp = (ThrPool *)arg;
-       while (1) {
-               ThrPool::job_t j;
-               if (!tp->takeJob(&j))
-                       break; //die
-
-               (void)(j.f)(j.a);
-       }
-       pthread_exit(NULL);
+// if blocking, then addJob() blocks when queue is full
+// otherwise, addJob() simply returns false when queue is full
+thread_pool::thread_pool(size_t sz, bool blocking)
+: nthreads_(sz),blockadd_(blocking),jobq_(100*sz) {
+    for (size_t i=0; i<nthreads_; i++)
+        th_.emplace_back(&thread_pool::do_worker, this);
 }
 
-//if blocking, then addJob() blocks when queue is full
-//otherwise, addJob() simply returns false when queue is full
-ThrPool::ThrPool(int sz, bool blocking)
-: nthreads_(sz),blockadd_(blocking),jobq_(100*sz) 
-{
-       pthread_attr_init(&attr_);
-       pthread_attr_setstacksize(&attr_, 128<<10);
+// IMPORTANT: this function can be called only when no external thread 
+// will ever use this thread pool again or is currently blocking on it
+thread_pool::~thread_pool() {
+    for (size_t i=0; i<nthreads_; i++)
+        jobq_.enq(job_t());
 
-       for (int i = 0; i < sz; i++) {
-               pthread_t t;
-               VERIFY(pthread_create(&t, &attr_, do_worker, (void *)this) ==0);
-               th_.push_back(t);
-       }
+    for (size_t i=0; i<nthreads_; i++)
+        th_[i].join();
 }
 
-//IMPORTANT: this function can be called only when no external thread 
-//will ever use this thread pool again or is currently blocking on it
-ThrPool::~ThrPool()
-{
-       for (int i = 0; i < nthreads_; i++) {
-               job_t j;
-               j.f = (void *(*)(void *))NULL; //poison pill to tell worker threads to exit
-               jobq_.enq(j);
-       }
-
-       for (int i = 0; i < nthreads_; i++) {
-               VERIFY(pthread_join(th_[i], NULL)==0);
-       }
-
-       VERIFY(pthread_attr_destroy(&attr_)==0);
+bool thread_pool::addJob(const job_t & j) {
+    return jobq_.enq(j,blockadd_);
 }
 
-bool 
-ThrPool::addJob(void *(*f)(void *), void *a)
-{
-       job_t j;
-       j.f = f;
-       j.a = a;
-
-       return jobq_.enq(j,blockadd_);
+void thread_pool::do_worker() {
+    job_t j;
+    while (1) {
+        jobq_.deq(&j);
+        if (!j)
+            break;
+        j();
+    }
 }
-
-bool 
-ThrPool::takeJob(job_t *j)
-{
-       jobq_.deq(j);
-       return (j->f!=NULL);
-}
-