vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-21 01:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implements sleeping/queued/running states for threaded activities

Browse source
This commit is contained in:
Simone Mainardi 2020-02-20 15:48:41 +01:00
parent 4706b8d9fe
commit 133f9e80bb
4 changed files with 115 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/ThreadPool.cpp
View file

@ -99,8 +99,9 @@ void ThreadPool::run() {
break;
} else {
Utils::setThreadName(q->script_path);
q->j->set_state_running(q->iface);
q->j->runScript(q->script_path, q->iface, q->deadline);
q->j->setRunning(q->iface, false);
q->j->set_state_sleeping(q->iface);
delete q;
}
}
@ -118,8 +119,8 @@ bool ThreadPool::queueJob(ThreadedActivity *ta, char *path, NetworkInterface *if
if(isTerminating())
return(false);
if(ta->isRunning(iface))
return(false); /* Task still running, don't re-queue it */
if(!ta->isQueueable(iface))
return(false); /* Task still running or already queued, don't re-queue it */
q = new QueuedThreadData(ta, path, iface, deadline);
@ -130,7 +131,7 @@ bool ThreadPool::queueJob(ThreadedActivity *ta, char *path, NetworkInterface *if
m->lock(__FILE__, __LINE__);
threads.push(q);
ta->setRunning(iface, true);
ta->set_state_queued(iface);
pthread_cond_signal(&condvar);
m->unlock(__FILE__, __LINE__);