tc now supports hierarchical qdiscs too

[netdata.git] / src / proc_diskstats.c

diff --git a/src/proc_diskstats.c b/src/proc_diskstats.c
index fed87e8e7c6ff81252e922b1d1ad218f8b2de485..9f7e8e9b2e29866546beb798508477bd1cad46b3 100644 (file)
--- a/src/proc_diskstats.c
+++ b/src/proc_diskstats.c
@@ -170,7 +170,7 @@ static struct disk *get_disk(unsigned long major, unsigned long minor, char *dis
 }
 
 static inline int is_major_enabled(int major) {
-    static char *major_configs = NULL;
+    static int8_t *major_configs = NULL;
     static size_t major_size = 0;
 
     if(major < 0) return 1;
@@ -178,7 +178,7 @@ static inline int is_major_enabled(int major) {
     size_t wanted_size = (size_t)major + 1;
 
     if(major_size < wanted_size) {
-        major_configs = reallocz(major_configs, wanted_size);
+        major_configs = reallocz(major_configs, wanted_size * sizeof(int8_t));
 
         size_t i;
         for(i = major_size; i < wanted_size ; i++)
@@ -193,12 +193,10 @@ static inline int is_major_enabled(int major) {
         major_configs[major] = (char)config_get_boolean("plugin:proc:/proc/diskstats", buffer, 1);
     }
 
-    return major_configs[major];
+    return (int)major_configs[major];
 }
 
 int do_proc_diskstats(int update_every, usec_t dt) {
-    (void)dt;
-
     static procfile *ff = NULL;
     static int  global_enable_new_disks_detected_at_runtime = CONFIG_ONDEMAND_YES,
                 global_enable_performance_for_physical_disks = CONFIG_ONDEMAND_ONDEMAND,
@@ -243,7 +241,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
     ff = procfile_readall(ff);
     if(unlikely(!ff)) return 0; // we return 0, so that we will retry to open it next time
 
-    uint32_t lines = procfile_lines(ff), l;
+    size_t lines = procfile_lines(ff), l;
 
     for(l = 0; l < lines ;l++) {
         // --------------------------------------------------------------------------
@@ -260,7 +258,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
                             last_writes = 0, last_writesectors = 0, last_writems = 0,
                             last_busy_ms = 0;
 
-        uint32_t words = procfile_linewords(ff, l);
+        size_t words = procfile_linewords(ff, l);
         if(unlikely(words < 14)) continue;
 
         major           = str2ul(procfile_lineword(ff, l, 0));