mirror of
https://github.com/monero-project/monero.git
synced 2024-12-13 11:56:31 +02:00
threadpool: fix deadlock in recursive waiter usage
If a queued job uses a waiter, then we want to run that waiter's jobs in the current thread if all threads are busy, even if the queue is empty, since there is no guarantee that any thread will free up to take care of that new job, since all the threads might be running a job which spawns such a recursive job and will block till that recursive job is done, which it will never be since it relies on the queue being polled by one of those blocked threads.
This commit is contained in:
parent
7a9a4a6669
commit
c70e8daa91
@ -34,6 +34,8 @@
|
||||
#include "cryptonote_config.h"
|
||||
#include "common/util.h"
|
||||
|
||||
static __thread int depth = 0;
|
||||
|
||||
namespace tools
|
||||
{
|
||||
threadpool::threadpool() : running(true), active(0) {
|
||||
@ -60,11 +62,13 @@ threadpool::~threadpool() {
|
||||
void threadpool::submit(waiter *obj, std::function<void()> f) {
|
||||
entry e = {obj, f};
|
||||
boost::unique_lock<boost::mutex> lock(mutex);
|
||||
if (active == max && !queue.empty()) {
|
||||
if ((active == max && !queue.empty()) || depth > 0) {
|
||||
// if all available threads are already running
|
||||
// and there's work waiting, just run in current thread
|
||||
lock.unlock();
|
||||
++depth;
|
||||
f();
|
||||
--depth;
|
||||
} else {
|
||||
if (obj)
|
||||
obj->inc();
|
||||
@ -106,7 +110,9 @@ void threadpool::run() {
|
||||
e = queue.front();
|
||||
queue.pop_front();
|
||||
lock.unlock();
|
||||
++depth;
|
||||
e.f();
|
||||
--depth;
|
||||
|
||||
if (e.wo)
|
||||
e.wo->dec();
|
||||
|
Loading…
Reference in New Issue
Block a user