Fixed two major bugs in paxos.cc.

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

diff --git a/rpc/thr_pool.cc b/rpc/thr_pool.cc
index 146764f..64b3263 100644 (file)
--- a/rpc/thr_pool.cc
+++ b/rpc/thr_pool.cc
@@ -1,42 +1,33 @@
 #include "thr_pool.h"
 #include "thr_pool.h"

-#include <stdlib.h>
-#include <errno.h>
-#include "lang/verify.h"

 
 // if blocking, then addJob() blocks when queue is full
 // otherwise, addJob() simply returns false when queue is full
 
 // 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) 
-{
-       for (int i=0; i<nthreads_; i++)
-        th_.push_back(std::thread(&ThrPool::do_worker, this));
+ThrPool::ThrPool(size_t sz, bool blocking)
+: nthreads_(sz),blockadd_(blocking),jobq_(100*sz) {
+    for (size_t i=0; i<nthreads_; i++)
+        th_.emplace_back(&ThrPool::do_worker, this);

 }
 
 // IMPORTANT: this function can be called only when no external thread 
 // will ever use this thread pool again or is currently blocking on it
 }
 
 // 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++)
-               jobq_.enq(job_t());
+ThrPool::~ThrPool() {
+    for (size_t i=0; i<nthreads_; i++)
+        jobq_.enq(job_t());

 
 

-       for (int i=0; i<nthreads_; i++)
+    for (size_t i=0; i<nthreads_; i++)

         th_[i].join();
 }
 
         th_[i].join();
 }
 

-bool 
-ThrPool::addJob(const job_t &j)
-{
-       return jobq_.enq(j,blockadd_);
+bool ThrPool::addJob(const job_t &j) {
+    return jobq_.enq(j,blockadd_);

 }
 
 }
 

-void
-ThrPool::do_worker()
-{
+void ThrPool::do_worker() {

     job_t j;
     job_t j;

-       while (1) {
+    while (1) {

         jobq_.deq(&j);
         jobq_.deq(&j);

-               if (!j)
-                       break;
-               j();
-       }
+        if (!j)
+            break;
+        j();
+    }

 }
 }