From da47939df1e7bf6f25dd2d6cf2360d777ab78123 Mon Sep 17 00:00:00 2001 From: "Costa Tsaousis (ktsaou)" Date: Tue, 27 Sep 2016 21:45:26 +0300 Subject: [PATCH] add information about threads exiting --- src/plugin_proc.c | 4 +++- src/plugins_d.c | 8 ++++++-- src/rrd.c | 4 +++- src/sys_fs_cgroup.c | 6 ++++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/plugin_proc.c b/src/plugin_proc.c index 3c57b66b..a50a2251 100644 --- a/src/plugin_proc.c +++ b/src/plugin_proc.c @@ -63,7 +63,7 @@ void *proc_main(void *ptr) unsigned long long sunext = (time(NULL) - (time(NULL) % rrd_update_every) + rrd_update_every) * 1000000ULL; unsigned long long sunow; - for(;1;) { + for(;;) { if(unlikely(netdata_exit)) break; // delay until it is our time to run @@ -241,6 +241,8 @@ void *proc_main(void *ptr) } } + info("PROC thread exiting"); + pthread_exit(NULL); return NULL; } diff --git a/src/plugins_d.c b/src/plugins_d.c index 55ccd544..8bcb57f2 100644 --- a/src/plugins_d.c +++ b/src/plugins_d.c @@ -109,7 +109,7 @@ void *pluginsd_worker_thread(void *arg) size_t count = 0; - while(likely(1)) { + for(;;) { if(unlikely(netdata_exit)) break; FILE *fp = mypopen(cd->cmd, &cd->pid); @@ -434,6 +434,8 @@ void *pluginsd_worker_thread(void *arg) break; } + info("PLUGINSD: '%s' thread exiting", cd->fullfilename); + cd->obsolete = 1; pthread_exit(NULL); return NULL; @@ -462,7 +464,7 @@ void *pluginsd_main(void *ptr) { if(scan_frequency < 1) scan_frequency = 1; - while(likely(1)) { + for(;;) { if(unlikely(netdata_exit)) break; dir = opendir(dir_name); @@ -542,6 +544,8 @@ void *pluginsd_main(void *ptr) { sleep((unsigned int) scan_frequency); } + info("PLUGINS.D thread exiting"); + pthread_exit(NULL); return NULL; } diff --git a/src/rrd.c b/src/rrd.c index 59b0c998..14fbbaf6 100644 --- a/src/rrd.c +++ b/src/rrd.c @@ -1387,8 +1387,10 @@ unsigned long long rrdset_done(RRDSET *st) break; } - if(unlikely(!store_this_entry)) + if(unlikely(!store_this_entry)) { + rd->values[st->current_entry] = pack_storage_number(0, SN_NOT_EXISTS); continue; + } if(likely(rd->updated && rd->counter > 1 && iterations < st->gap_when_lost_iterations_above)) { rd->values[st->current_entry] = pack_storage_number(new_value, storage_flags ); diff --git a/src/sys_fs_cgroup.c b/src/sys_fs_cgroup.c index 0ffd55e2..010af824 100644 --- a/src/sys_fs_cgroup.c +++ b/src/sys_fs_cgroup.c @@ -1326,7 +1326,7 @@ int do_sys_fs_cgroup(int update_every, unsigned long long dt) { void *cgroups_main(void *ptr) { - if(ptr) { ; } + (void)ptr; info("CGROUP Plugin thread created with task id %d", gettid()); @@ -1351,7 +1351,7 @@ void *cgroups_main(void *ptr) RRDSET *stcpu_thread = NULL; - for(;1;) { + for(;;) { if(unlikely(netdata_exit)) break; // delay until it is our time to run @@ -1396,6 +1396,8 @@ void *cgroups_main(void *ptr) } } + info("CGROUP thread exiting"); + pthread_exit(NULL); return NULL; } -- 2.39.2