diff options
Diffstat (limited to '')
| -rw-r--r-- | src/daemon/global_statistics.c (renamed from daemon/global_statistics.c) | 73 |
1 files changed, 37 insertions, 36 deletions
diff --git a/daemon/global_statistics.c b/src/daemon/global_statistics.c index 9fb1df5f8..1798bfddb 100644 --- a/daemon/global_statistics.c +++ b/src/daemon/global_statistics.c @@ -858,7 +858,7 @@ static void global_statistics_charts(void) { // ---------------------------------------------------------------- #ifdef ENABLE_DBENGINE - if (tier_page_type[0] == PAGE_GORILLA_METRICS) + if (tier_page_type[0] == RRDENG_PAGE_TYPE_GORILLA_32BIT) { static RRDSET *st_tier0_gorilla_pages = NULL; static RRDDIM *rd_num_gorilla_pages = NULL; @@ -887,7 +887,7 @@ static void global_statistics_charts(void) { rrdset_done(st_tier0_gorilla_pages); } - if (tier_page_type[0] == PAGE_GORILLA_METRICS) + if (tier_page_type[0] == RRDENG_PAGE_TYPE_GORILLA_32BIT) { static RRDSET *st_tier0_compression_info = NULL; @@ -2560,9 +2560,9 @@ static void dbengine2_statistics_charts(void) { /* get localhost's DB engine's statistics for each tier */ for(size_t tier = 0; tier < storage_tiers ;tier++) { if(host->db[tier].mode != RRD_MEMORY_MODE_DBENGINE) continue; - if(!host->db[tier].instance) continue; + if(!host->db[tier].si) continue; - if(is_storage_engine_shared(host->db[tier].instance)) { + if(is_storage_engine_shared(host->db[tier].si)) { if(counted_multihost_db[tier]) continue; else @@ -2570,7 +2570,7 @@ static void dbengine2_statistics_charts(void) { } ++dbengine_contexts; - rrdeng_get_37_statistics((struct rrdengine_instance *)host->db[tier].instance, local_stats_array); + rrdeng_get_37_statistics((struct rrdengine_instance *)host->db[tier].si, local_stats_array); for (i = 0; i < RRDENG_NR_STATS; ++i) { /* aggregate statistics across hosts */ stats_array[i] += local_stats_array[i]; @@ -4308,25 +4308,25 @@ void *global_statistics_workers_main(void *ptr) { global_statistics_register_workers(); - netdata_thread_cleanup_push(global_statistics_workers_cleanup, ptr); - - int update_every = - (int)config_get_number(CONFIG_SECTION_GLOBAL_STATISTICS, "update every", localhost->rrd_update_every); - if (update_every < localhost->rrd_update_every) - update_every = localhost->rrd_update_every; - - usec_t step = update_every * USEC_PER_SEC; - heartbeat_t hb; - heartbeat_init(&hb); + netdata_thread_cleanup_push(global_statistics_workers_cleanup, ptr) + { + int update_every = + (int)config_get_number(CONFIG_SECTION_GLOBAL_STATISTICS, "update every", localhost->rrd_update_every); + if (update_every < localhost->rrd_update_every) + update_every = localhost->rrd_update_every; - while (service_running(SERVICE_COLLECTORS)) { - worker_is_idle(); - heartbeat_next(&hb, step); + usec_t step = update_every * USEC_PER_SEC; + heartbeat_t hb; + heartbeat_init(&hb); - worker_is_busy(WORKER_JOB_WORKERS); - worker_utilization_charts(); - } + while (service_running(SERVICE_COLLECTORS)) { + worker_is_idle(); + heartbeat_next(&hb, step); + worker_is_busy(WORKER_JOB_WORKERS); + worker_utilization_charts(); + } + } netdata_thread_cleanup_pop(1); return NULL; } @@ -4350,25 +4350,26 @@ void *global_statistics_sqlite3_main(void *ptr) { global_statistics_register_workers(); - netdata_thread_cleanup_push(global_statistics_sqlite3_cleanup, ptr); - - int update_every = - (int)config_get_number(CONFIG_SECTION_GLOBAL_STATISTICS, "update every", localhost->rrd_update_every); - if (update_every < localhost->rrd_update_every) - update_every = localhost->rrd_update_every; + netdata_thread_cleanup_push(global_statistics_sqlite3_cleanup, ptr) + { - usec_t step = update_every * USEC_PER_SEC; - heartbeat_t hb; - heartbeat_init(&hb); + int update_every = + (int)config_get_number(CONFIG_SECTION_GLOBAL_STATISTICS, "update every", localhost->rrd_update_every); + if (update_every < localhost->rrd_update_every) + update_every = localhost->rrd_update_every; - while (service_running(SERVICE_COLLECTORS)) { - worker_is_idle(); - heartbeat_next(&hb, step); + usec_t step = update_every * USEC_PER_SEC; + heartbeat_t hb; + heartbeat_init(&hb); - worker_is_busy(WORKER_JOB_SQLITE3); - sqlite3_statistics_charts(); - } + while (service_running(SERVICE_COLLECTORS)) { + worker_is_idle(); + heartbeat_next(&hb, step); + worker_is_busy(WORKER_JOB_SQLITE3); + sqlite3_statistics_charts(); + } + } netdata_thread_cleanup_pop(1); return NULL; } |