Merge pull request #1788 from l2isbad/web_log_plugin_fix

[netdata.git] / src / proc_diskstats.c

diff --git a/src/proc_diskstats.c b/src/proc_diskstats.c
index fed87e8e7c6ff81252e922b1d1ad218f8b2de485..b21838b6182bdb682a43d2ef8b798eeba8613485 100644 (file)
--- a/src/proc_diskstats.c
+++ b/src/proc_diskstats.c
@@ -72,7 +72,7 @@ static struct disk *get_disk(unsigned long major, unsigned long minor, char *dis
 
     // get the default path for finding info about the block device
     if(unlikely(!path_find_block_device[0])) {
-        snprintfz(buffer, FILENAME_MAX, "%s%s", global_host_prefix, "/sys/dev/block/%lu:%lu/%s");
+        snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/dev/block/%lu:%lu/%s");
         snprintfz(path_find_block_device, FILENAME_MAX, "%s", config_get("plugin:proc:/proc/diskstats", "path to get block device infos", buffer));
     }
 
@@ -126,11 +126,11 @@ static struct disk *get_disk(unsigned long major, unsigned long minor, char *dis
     // find the disk sector size
 
     if(unlikely(!path_to_get_hw_sector_size[0])) {
-        snprintfz(buffer, FILENAME_MAX, "%s%s", global_host_prefix, "/sys/block/%s/queue/hw_sector_size");
+        snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/block/%s/queue/hw_sector_size");
         snprintfz(path_to_get_hw_sector_size, FILENAME_MAX, "%s", config_get("plugin:proc:/proc/diskstats", "path to get h/w sector size", buffer));
     }
     if(unlikely(!path_to_get_hw_sector_size_partitions[0])) {
-        snprintfz(buffer, FILENAME_MAX, "%s%s", global_host_prefix, "/sys/dev/block/%lu:%lu/subsystem/%s/../queue/hw_sector_size");
+        snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/dev/block/%lu:%lu/subsystem/%s/../queue/hw_sector_size");
         snprintfz(path_to_get_hw_sector_size_partitions, FILENAME_MAX, "%s", config_get("plugin:proc:/proc/diskstats", "path to get h/w sector size for partitions", buffer));
     }
 
@@ -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,
@@ -235,7 +233,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
 
     if(unlikely(!ff)) {
         char filename[FILENAME_MAX + 1];
-        snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/diskstats");
+        snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/diskstats");
         ff = procfile_open(config_get("plugin:proc:/proc/diskstats", "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT);
     }
     if(unlikely(!ff)) return 0;
@@ -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));