Keep Waker around for longer so it works better (#2184).

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 24ba5bc451449bc59ab63d2c71d8ed182eb56a13..cd471d171a7cd24808da05d8e36a6e6698b38740 100644 (file)
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -336,8 +336,7 @@ EncodeServer::handle (shared_ptr<Socket> socket)
 {
        boost::mutex::scoped_lock lock (_mutex);
 
-       Waker waker;
-       waker.nudge ();
+       _waker.nudge ();
 
        /* Wait until the queue has gone down a bit */
        while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {

diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h
index 6e24a19849827cdde20c276e79d331b8a2cd1ab5..0ca60f3f3debf8c0b423618dcccc9d0f908d3955 100644 (file)
--- a/src/lib/encode_server.h
+++ b/src/lib/encode_server.h
@@ -28,16 +28,17 @@
  */
 
 
-#include "server.h"
+#include "cross.h"
 #include "exception_store.h"
-#include <boost/thread.hpp>
+#include "server.h"
 #include <boost/asio.hpp>
+#include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <string>
 
 
-class Socket;
 class Log;
+class Socket;
 
 
 /** @class EncodeServer
@@ -65,6 +66,7 @@ private:
        boost::condition _empty_condition;
        bool _verbose;
        int _num_threads;
+       Waker _waker;
 
        struct Broadcast {