PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tear-down of worker

This commit is contained in:
Andre Puschmann 2019-09-25 12:50:36 +02:00
parent 6db0e474be
commit d73965e887
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/src/common/thread_pool.cc
View File

@ -19,9 +19,10 @@
* *
*/ */
#include <assert.h>
#include <stdio.h>
#include "srslte/common/thread_pool.h" #include "srslte/common/thread_pool.h"
#include <assert.h>
#include <chrono>
#include <stdio.h>
#define DEBUG 0 #define DEBUG 0
#define debug_thread(fmt, ...) do { if(DEBUG) printf(fmt, __VA_ARGS__); } while(0) #define debug_thread(fmt, ...) do { if(DEBUG) printf(fmt, __VA_ARGS__); } while(0)
@ -310,22 +311,22 @@ void task_thread_pool::start(int32_t prio, uint32_t mask)
void task_thread_pool::stop() void task_thread_pool::stop()
{ {
std::unique_lock<std::mutex> lock(queue_mutex); std::unique_lock<std::mutex> lock(queue_mutex);
running = false; running = false;
do { nof_workers_running = 0;
nof_workers_running = 0; // next worker that is still running
// next worker that is still running for (worker_t& w : workers) {
for (worker_t& w : workers) { if (w.is_running()) {
if (w.is_running()) { nof_workers_running++;
nof_workers_running++;
}
} }
if (nof_workers_running > 0) { }
lock.unlock(); if (nof_workers_running > 0) {
cv_empty.notify_all(); lock.unlock();
lock.lock(); cv_empty.notify_all();
lock.lock();
while (nof_workers_running > 0) {
cv_exit.wait(lock); cv_exit.wait(lock);
} }
} while (nof_workers_running > 0); }
} }
void task_thread_pool::push_task(const task_t& task) void task_thread_pool::push_task(const task_t& task)