vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-20 09:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve periodic activities flags logic

Browse source
This commit is contained in:
emanuele-f 2020-02-25 11:21:47 +01:00
parent 2d672c9438
commit 3cd4532b3e
3 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/ThreadPool.cpp
View file

@ -113,15 +113,6 @@ void ThreadPool::run() {
/* **************************************************** */
static bool ignoreDeadlineExceeded(char *path) {
/* These scripts are allowed to exceeed their deadline */
return((strcmp(path, HOUSEKEEPING_SCRIPT_PATH) == 0) ||
(strcmp(path, DISCOVER_SCRIPT_PATH) == 0) ||
(strcmp(path, TIMESERIES_SCRIPT_PATH) == 0));
}
/* **************************************************** */
bool ThreadPool::queueJob(ThreadedActivity *ta, char *path, NetworkInterface *iface, time_t scheduled_time, time_t deadline) {
QueuedThreadData *q;
ThreadedActivityStats *stats = ta->getThreadedActivityStats(iface, true);
@ -129,16 +120,12 @@ bool ThreadPool::queueJob(ThreadedActivity *ta, char *path, NetworkInterface *if
if(isTerminating())
return(false);
if(stats)
stats->clearErrors();
if(!ta->isQueueable(iface)) {
if(stats) {
if(ta->get_state(iface) == threaded_activity_state_queued) {
stats->setNotExecutedAttivity();
} else if((ta->get_state(iface) == threaded_activity_state_running) && !ignoreDeadlineExceeded(path)) {
stats->setSlowPeriodicActivity();
}
if(ta->get_state(iface) == threaded_activity_state_queued)
stats->setNotExecutedAttivity(true);
else if((ta->get_state(iface) == threaded_activity_state_running))
stats->setSlowPeriodicActivity(true);
}
return(false); /* Task still running or already queued, don't re-queue it */