diff options
| author | Kenneth Heafield <github@kheafield.com> | 2014-06-02 21:28:02 +0400 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2014-06-02 21:29:40 +0400 |
| commit | dd03f9fb69da82a37f1846d25dcc8d8781956e96 (patch) | |
| tree | 12df06240d6149f110982d1f76c9addf40acbce1 /util/thread_pool.hh | |
| parent | 31a583b0bc322626356a42965f02534249070525 (diff) | |
KenLM 5a7efd8fe1db88ee0a9f7e9479b24ac3ca348221 with Hieu's patch to exception.hh
Diffstat (limited to 'util/thread_pool.hh')
| -rw-r--r-- | util/thread_pool.hh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/util/thread_pool.hh b/util/thread_pool.hh index 84e257ea6..d1a883a00 100644 --- a/util/thread_pool.hh +++ b/util/thread_pool.hh @@ -1,5 +1,5 @@ -#ifndef UTIL_THREAD_POOL__ -#define UTIL_THREAD_POOL__ +#ifndef UTIL_THREAD_POOL_H +#define UTIL_THREAD_POOL_H #include "util/pcqueue.hh" @@ -18,8 +18,8 @@ template <class HandlerT> class Worker : boost::noncopyable { typedef HandlerT Handler; typedef typename Handler::Request Request; - template <class Construct> Worker(PCQueue<Request> &in, Construct &construct, Request &poison) - : in_(in), handler_(construct), thread_(boost::ref(*this)), poison_(poison) {} + template <class Construct> Worker(PCQueue<Request> &in, Construct &construct, const Request &poison) + : in_(in), handler_(construct), poison_(poison), thread_(boost::ref(*this)) {} // Only call from thread. void operator()() { @@ -30,7 +30,7 @@ template <class HandlerT> class Worker : boost::noncopyable { try { (*handler_)(request); } - catch(std::exception &e) { + catch(const std::exception &e) { std::cerr << "Handler threw " << e.what() << std::endl; abort(); } @@ -49,10 +49,10 @@ template <class HandlerT> class Worker : boost::noncopyable { PCQueue<Request> &in_; boost::optional<Handler> handler_; + + const Request poison_; boost::thread thread_; - - Request poison_; }; template <class HandlerT> class ThreadPool : boost::noncopyable { @@ -92,4 +92,4 @@ template <class HandlerT> class ThreadPool : boost::noncopyable { } // namespace util -#endif // UTIL_THREAD_POOL__ +#endif // UTIL_THREAD_POOL_H |