Merging upstream version 1.41.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 8 deletions

diff --git a/daemon/global_statistics.c b/daemon/global_statistics.c
index ee68bebd..ce8d4140 100644
--- a/daemon/global_statistics.c
+++ b/daemon/global_statistics.c
@@ -231,10 +231,10 @@ static void global_statistics_charts(void) {
     static collected_number compression_ratio = -1,
                             average_response_time = -1;
 
-    static time_t netdata_start_time = 0;
-    if (!netdata_start_time)
-        netdata_start_time = now_boottime_sec();
-    time_t netdata_uptime = now_boottime_sec() - netdata_start_time;
+    static time_t netdata_boottime_time = 0;
+    if (!netdata_boottime_time)
+        netdata_boottime_time = now_boottime_sec();
+    time_t netdata_uptime = now_boottime_sec() - netdata_boottime_time;
 
     struct global_statistics gs;
     struct rusage me;
@@ -1718,7 +1718,7 @@ static void dbengine2_statistics_charts(void) {
     cache_efficiency_stats = rrdeng_get_cache_efficiency_stats();
 
     mrg_stats_old = mrg_stats;
-    mrg_stats = mrg_get_statistics(main_mrg);
+    mrg_get_statistics(main_mrg, &mrg_stats);
 
     struct rrdeng_buffer_sizes buffers = rrdeng_get_buffer_sizes();
     size_t buffers_total_size = buffers.handles + buffers.xt_buf + buffers.xt_io + buffers.pdc + buffers.descriptors +
@@ -3435,6 +3435,7 @@ static struct worker_utilization all_workers_utilization[] = {
     { .name = "RRDCONTEXT",  .family = "workers contexts",                .priority = 1000000 },
     { .name = "REPLICATION", .family = "workers replication sender",      .priority = 1000000 },
     { .name = "SERVICE",     .family = "workers service",                 .priority = 1000000 },
+    { .name = "PROFILER",    .family = "workers profile",                 .priority = 1000000 },
 
     // has to be terminated with a NULL
     { .name = NULL,          .family = NULL       }
@@ -4123,7 +4124,7 @@ static void global_statistics_cleanup(void *ptr)
     struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
     static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
 
-    info("cleaning up...");
+    netdata_log_info("cleaning up...");
 
     static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
 }
@@ -4194,7 +4195,7 @@ static void global_statistics_workers_cleanup(void *ptr)
     struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
     static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
 
-    info("cleaning up...");
+    netdata_log_info("cleaning up...");
 
     worker_utilization_finish();
 
@@ -4238,7 +4239,7 @@ static void global_statistics_sqlite3_cleanup(void *ptr)
     struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
     static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
 
-    info("cleaning up...");
+    netdata_log_info("cleaning up...");
 
     static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
 }