work-around for faster dimensions to eliminate extreme case NULL dereference

[netdata.git] / src / plugin_proc_diskspace.c

diff --git a/src/plugin_proc_diskspace.c b/src/plugin_proc_diskspace.c
index b0453a204d7e6f4985f9be3ff30171e879cd40a9..8b6bedfedd35a9851951ce382e4e6a4bad947199 100644 (file)
--- a/src/plugin_proc_diskspace.c
+++ b/src/plugin_proc_diskspace.c
@@ -186,6 +186,7 @@ void *proc_diskspace_main(void *ptr) {
         check_for_new_mountpoints_every = update_every;
 
     RRDSET *stcpu_thread = NULL, *st_duration = NULL;
+    RRDDIM *rd_user = NULL, *rd_system = NULL, *rd_duration = NULL;
     struct rusage thread;
 
     usec_t last = 0, dt = 0;
@@ -236,38 +237,34 @@ void *proc_diskspace_main(void *ptr) {
 
             if(!stcpu_thread) {
                 stcpu_thread = rrdset_find("netdata.plugin_diskspace");
-                if(!stcpu_thread) {
-                    stcpu_thread = rrdset_create("netdata", "plugin_diskspace", NULL, "diskspace", NULL
+                if(!stcpu_thread) stcpu_thread = rrdset_create("netdata", "plugin_diskspace", NULL, "diskspace", NULL
                                                  , "NetData Disk Space Plugin CPU usage", "milliseconds/s", 132020
                                                  , update_every, RRDSET_TYPE_STACKED);
 
-                    rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL);
-                    rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
-                }
+                rd_user = rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRDDIM_INCREMENTAL);
+                rd_system = rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
             }
             else
                 rrdset_next(stcpu_thread);
 
-            rrddim_set(stcpu_thread, "user", thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec);
-            rrddim_set(stcpu_thread, "system", thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec);
+            rrddim_set_by_pointer(stcpu_thread, rd_user, thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec);
+            rrddim_set_by_pointer(stcpu_thread, rd_system, thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec);
             rrdset_done(stcpu_thread);
 
             // ----------------------------------------------------------------
 
             if(!st_duration) {
                 st_duration = rrdset_find("netdata.plugin_diskspace_dt");
-                if(!st_duration) {
-                    st_duration = rrdset_create("netdata", "plugin_diskspace_dt", NULL, "diskspace", NULL
+                if(!st_duration) st_duration = rrdset_create("netdata", "plugin_diskspace_dt", NULL, "diskspace", NULL
                                                  , "NetData Disk Space Plugin Duration", "milliseconds/run", 132021
                                                  , update_every, RRDSET_TYPE_AREA);
 
-                    rrddim_add(st_duration, "duration", NULL, 1, 1000, RRDDIM_ABSOLUTE);
-                }
+                rd_duration = rrddim_add(st_duration, "duration", NULL, 1, 1000, RRDDIM_ABSOLUTE);
             }
             else
                 rrdset_next(st_duration);
 
-            rrddim_set(st_duration, "duration", dt);
+            rrddim_set_by_pointer(st_duration, rd_duration, dt);
             rrdset_done(st_duration);
 
             // ----------------------------------------------------------------