From a45009f0063a98260c835786901dbd00ec5e9705 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Sat, 15 Aug 2015 20:06:27 +0200 Subject: Move running flag out of workerdata --- src/InputZeroMQReader.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/InputZeroMQReader.cpp') diff --git a/src/InputZeroMQReader.cpp b/src/InputZeroMQReader.cpp index 70b0afc..58d76c9 100644 --- a/src/InputZeroMQReader.cpp +++ b/src/InputZeroMQReader.cpp @@ -84,6 +84,10 @@ int InputZeroMQReader::GetNextFrame(void* buffer) { const size_t framesize = 6144; + if (not worker_.is_running()) { + return 0; + } + std::shared_ptr > incoming; /* Do some prebuffering because reads will happen in bursts @@ -98,7 +102,7 @@ int InputZeroMQReader::GetNextFrame(void* buffer) in_messages_.wait_and_pop(incoming); } - if (! workerdata_.running) { + if (not worker_.is_running()) { throw zmq_input_overflow(); } @@ -217,14 +221,13 @@ void InputZeroMQWorker::RecvProcess(struct InputZeroMQThreadData* workerdata) subscriber.close(); - workerdata->running = false; + running = false; workerdata->in_messages->notify(); } void InputZeroMQWorker::Start(struct InputZeroMQThreadData* workerdata) { running = true; - workerdata->running = true; recv_thread = boost::thread(&InputZeroMQWorker::RecvProcess, this, workerdata); } -- cgit v1.2.3