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

Adds and enforces periodic activities max duration

Browse source 
Implements #3477
This commit is contained in:
Simone Mainardi 2020-03-02 19:09:54 +01:00
parent 1074059c2d
commit 1e82eb073b
10 changed files with 91 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/ThreadPool.cpp
View file

@ -121,10 +121,22 @@ bool ThreadPool::queueJob(ThreadedActivity *ta, char *path, NetworkInterface *if
return(false);
if(!ta->isQueueable(iface)) {
ThreadedActivityState ta_state = ta->get_state(iface);
#ifdef THREAD_DEBUG
char deadline_buf[32];
time_t stats_deadline = stats->getDeadline();
struct tm deadline_tm;
strftime(deadline_buf, sizeof(deadline_buf), "%H:%M:%S", localtime_r(&stats_deadline, &deadline_tm));
ntop->getTrace()->traceEvent(TRACE_WARNING, "Unable to schedule %s [running: %u][deadlline: %s]", path, ta_state == threaded_activity_state_running ? 1 : 0, deadline_buf);
#endif
if(stats) {
if(ta->get_state(iface) == threaded_activity_state_queued)
if(ta_state == threaded_activity_state_queued)
stats->setNotExecutedAttivity(true);
else if((ta->get_state(iface) == threaded_activity_state_running))
else if(ta_state == threaded_activity_state_running
&& stats->getDeadline() < scheduled_time)
stats->setSlowPeriodicActivity(true);
}
@ -139,16 +151,16 @@ bool ThreadPool::queueJob(ThreadedActivity *ta, char *path, NetworkInterface *if
}
m->lock(__FILE__, __LINE__);
threads.push(q);
if(stats)
stats->setScheduledTime(scheduled_time);
ta->set_state_queued(iface);
threads.push(q);
pthread_cond_signal(&condvar);
m->unlock(__FILE__, __LINE__);
if(stats) {
stats->setScheduledTime(scheduled_time);
stats->setDeadline(deadline);
}
return(true); /* TODO: add a max queue len and return false */
}