for(m = excluded_mount_points; m ; m = m->next) {
if(m->len <= len) {
// fprintf(stderr, "SPACE: comparing '%s' with '%s'\n", mount_point, m->prefix);
- if(strncmp(m->prefix, mount_point, m->len) == 0) {
+ if(unlikely(strncmp(m->prefix, mount_point, m->len) == 0)) {
// fprintf(stderr, "SPACE: excluded '%s'\n", mount_point);
return 1;
}
};
static inline void do_disk_space_stats(struct disk *d, const char *mount_point, const char *mount_source, const char *disk, const char *family, int update_every, unsigned long long dt) {
+ (void)dt;
+
static DICTIONARY *mount_points = NULL;
int do_space, do_inodes;
// if not the mountpoint has changed.
struct stat buff_stat;
- if(stat(mount_point, &buff_stat) == -1) {
+ if(unlikely(stat(mount_point, &buff_stat) == -1)) {
error("Failed to stat() for '%s' (disk '%s')", mount_point, disk);
return;
}
- else if(major(buff_stat.st_dev) != d->major || minor(buff_stat.st_dev) != d->minor) {
+ else if(unlikely(major(buff_stat.st_dev) != d->major || minor(buff_stat.st_dev) != d->minor)) {
error("Disk '%s' (disk '%s') switched major:minor", mount_point, disk);
freez(d->mount_point);
d->mount_point = NULL;
}
else {
struct mount_point_metadata *m = dictionary_get(mount_points, mount_point);
- if(!m) {
+ if(unlikely(!m)) {
char var_name[4096 + 1];
snprintfz(var_name, 4096, "plugin:proc:/proc/diskstats:%s", mount_point);
int def_space = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
int def_inodes = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "inodes usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
- if(is_mount_point_excluded(mount_point)) {
+ if(unlikely(is_mount_point_excluded(mount_point))) {
def_space = CONFIG_ONDEMAND_NO;
def_inodes = CONFIG_ONDEMAND_NO;
}
}
}
- if(do_space == CONFIG_ONDEMAND_NO && do_inodes == CONFIG_ONDEMAND_NO)
+ if(unlikely(do_space == CONFIG_ONDEMAND_NO && do_inodes == CONFIG_ONDEMAND_NO))
return;
struct statvfs buff_statvfs;
if(do_space == CONFIG_ONDEMAND_YES || (do_space == CONFIG_ONDEMAND_ONDEMAND && (bavail || breserved_root || bused))) {
st = rrdset_find_bytype("disk_space", disk);
- if(!st) {
+ if(unlikely(!st)) {
char title[4096 + 1];
snprintfz(title, 4096, "Disk Space Usage for %s [%s]", family, mount_source);
st = rrdset_create("disk_space", disk, NULL, family, "disk.space", title, "GB", 2023, update_every, RRDSET_TYPE_STACKED);
rrddim_add(st, "used" , NULL, bsize, 1024*1024*1024, RRDDIM_ABSOLUTE);
rrddim_add(st, "reserved_for_root", "reserved for root", bsize, 1024*1024*1024, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "avail", bavail);
rrddim_set(st, "used", bused);
if(do_inodes == CONFIG_ONDEMAND_YES || (do_inodes == CONFIG_ONDEMAND_ONDEMAND && (favail || freserved_root || fused))) {
st = rrdset_find_bytype("disk_inodes", disk);
- if(!st) {
+ if(unlikely(!st)) {
char title[4096 + 1];
snprintfz(title, 4096, "Disk Files (inodes) Usage for %s [%s]", family, mount_source);
st = rrdset_create("disk_inodes", disk, NULL, family, "disk.inodes", title, "Inodes", 2024, update_every, RRDSET_TYPE_STACKED);
rrddim_add(st, "used" , NULL, 1, 1, RRDDIM_ABSOLUTE);
rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "avail", favail);
rrddim_set(st, "used", fused);
d->next = NULL;
// append it to the list
- if(!disk_root)
+ if(unlikely(!disk_root))
disk_root = d;
else {
struct disk *last;
// find if it is a partition
// by checking if /sys/dev/block/MAJOR:MINOR/partition is readable.
snprintfz(buffer, FILENAME_MAX, path_find_block_device, major, minor, "partition");
- if(access(buffer, R_OK) == 0) {
+ if(likely(access(buffer, R_OK) == 0)) {
d->type = DISK_TYPE_PARTITION;
- } else {
+ }
+ else {
// find if it is a container
// by checking if /sys/dev/block/MAJOR:MINOR/slaves has entries
snprintfz(buffer, FILENAME_MAX, path_find_block_device, major, minor, "slaves/");
- DIR *dirp = opendir(buffer);
- if (dirp != NULL) {
+ DIR *dirp = opendir(buffer);
+ if(likely(dirp != NULL)) {
struct dirent *dp;
while( (dp = readdir(dirp)) ) {
// . and .. are also files in empty folders.
- if(strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0) {
+ if(unlikely(strcmp(dp->d_name, ".") == 0 || strcmp(dp->d_name, "..") == 0)) {
continue;
}
// Stop the loop after we found one file.
break;
}
- if(closedir(dirp) == -1)
+ if(unlikely(closedir(dirp) == -1))
error("Unable to close dir %s", buffer);
}
}
mi = mountinfo_find(disk_mountinfo_root, d->major, d->minor);
}
*/
- if(mi) {
+ if(unlikely(mi)) {
d->mount_point = strdupz(mi->mount_point);
d->mount_point_hash = mi->mount_point_hash;
}
// ------------------------------------------------------------------------
// find the disk sector size
- if(!path_to_get_hw_sector_size[0]) {
+ 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(path_to_get_hw_sector_size, FILENAME_MAX, "%s", config_get("plugin:proc:/proc/diskstats", "path to get h/w sector size", buffer));
}
- if(!path_to_get_hw_sector_size_partitions[0]) {
+ 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(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));
}
// replace all / with !
for(t = tf; *t ;t++)
- if(*t == '/') *t = '!';
+ if(unlikely(*t == '/')) *t = '!';
- if(d->type == DISK_TYPE_PARTITION)
+ if(likely(d->type == DISK_TYPE_PARTITION))
snprintfz(buffer, FILENAME_MAX, path_to_get_hw_sector_size_partitions, d->major, d->minor, tf);
else
snprintfz(buffer, FILENAME_MAX, path_to_get_hw_sector_size, tf);
FILE *fpss = fopen(buffer, "r");
- if(fpss) {
+ if(likely(fpss)) {
char buffer2[1024 + 1];
char *tmp = fgets(buffer2, 1024, fpss);
- if(tmp) {
+ if(likely(tmp)) {
d->sector_size = atoi(tmp);
- if(d->sector_size <= 0) {
+ if(unlikely(d->sector_size <= 0)) {
error("Invalid sector size %d for device %s in %s. Assuming 512.", d->sector_size, d->disk, buffer);
d->sector_size = 512;
}
}
static inline int select_positive_option(int option1, int option2) {
- if(option1 == CONFIG_ONDEMAND_YES || option2 == CONFIG_ONDEMAND_YES)
+ if(unlikely(option1 == CONFIG_ONDEMAND_YES || option2 == CONFIG_ONDEMAND_YES))
return CONFIG_ONDEMAND_YES;
- else if(option1 == CONFIG_ONDEMAND_ONDEMAND || option2 == CONFIG_ONDEMAND_ONDEMAND)
+ else if(unlikely(option1 == CONFIG_ONDEMAND_ONDEMAND || option2 == CONFIG_ONDEMAND_ONDEMAND))
return CONFIG_ONDEMAND_ONDEMAND;
return CONFIG_ONDEMAND_NO;
}
int do_proc_diskstats(int update_every, unsigned long long 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,
globals_initialized = 1;
}
- if(!ff) {
+ if(unlikely(!ff)) {
char filename[FILENAME_MAX + 1];
snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/diskstats");
ff = procfile_open(config_get("plugin:proc:/proc/diskstats", "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT);
}
- if(!ff) return 1;
+ if(unlikely(!ff)) return 1;
ff = procfile_readall(ff);
- if(!ff) return 0; // we return 0, so that we will retry to open it next time
+ 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;
- uint32_t words;
// this is smart enough not to reload it every time
mountinfo_reload(0);
last_writes = 0, last_writesectors = 0, last_writems = 0,
last_busy_ms = 0;
- words = procfile_linewords(ff, l);
- if(words < 14) continue;
+ uint32_t words = procfile_linewords(ff, l);
+ if(unlikely(words < 14)) continue;
major = strtoul(procfile_lineword(ff, l, 0), NULL, 10);
minor = strtoul(procfile_lineword(ff, l, 1), NULL, 10);
snprintfz(var_name, 4096, "plugin:proc:/proc/diskstats:%s", disk);
int def_enable = config_get_boolean_ondemand(var_name, "enable", global_enable_new_disks_detected_at_runtime);
- if(def_enable == CONFIG_ONDEMAND_NO) {
+ if(unlikely(def_enable == CONFIG_ONDEMAND_NO)) {
// the user does not want any metrics for this disk
d->do_io = CONFIG_ONDEMAND_NO;
d->do_ops = CONFIG_ONDEMAND_NO;
ddo_backlog = CONFIG_ONDEMAND_NO;
// we enable individual performance charts only when def_performance is not disabled
- if(def_performance != CONFIG_ONDEMAND_NO) {
+ if(unlikely(def_performance != CONFIG_ONDEMAND_NO)) {
ddo_io = global_do_io,
ddo_ops = global_do_ops,
ddo_mops = global_do_mops,
d->do_backlog = config_get_boolean_ondemand(var_name, "backlog", ddo_backlog);
// def_space
- if(d->mount_point) {
+ if(unlikely(d->mount_point)) {
// check the user configuration (this will also show our 'on demand' decision)
def_space = config_get_boolean_ondemand(var_name, "enable space metrics", def_space);
d->do_io = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype(RRD_TYPE_DISK, disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create(RRD_TYPE_DISK, disk, NULL, family, "disk.io", "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA);
rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRDDIM_INCREMENTAL);
rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
last_readsectors = rrddim_set(st, "reads", readsectors);
last_writesectors = rrddim_set(st, "writes", writesectors);
d->do_ops = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_ops", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_ops", disk, NULL, family, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
last_reads = rrddim_set(st, "reads", reads);
last_writes = rrddim_set(st, "writes", writes);
d->do_qops = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_qops", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_qops", disk, NULL, family, "disk.qops", "Disk Current I/O Operations", "operations", 2002, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "operations", NULL, 1, 1, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "operations", queued_ios);
rrdset_done(st);
d->do_backlog = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_backlog", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_backlog", disk, NULL, family, "disk.backlog", "Disk Backlog", "backlog (ms)", 2003, update_every, RRDSET_TYPE_AREA);
st->isdetail = 1;
rrddim_add(st, "backlog", NULL, 1, 10, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "backlog", backlog_ms);
rrdset_done(st);
d->do_util = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_util", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_util", disk, NULL, family, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
st->isdetail = 1;
rrddim_add(st, "utilization", NULL, 1, 10, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
last_busy_ms = rrddim_set(st, "utilization", busy_ms);
rrdset_done(st);
d->do_mops = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_mops", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_mops", disk, NULL, family, "disk.mops", "Disk Merged Operations", "merged operations/s", 2021, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "reads", mreads);
rrddim_set(st, "writes", mwrites);
d->do_iotime = CONFIG_ONDEMAND_YES;
st = rrdset_find_bytype("disk_iotime", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_iotime", disk, NULL, family, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
last_readms = rrddim_set(st, "reads", readms);
last_writems = rrddim_set(st, "writes", writems);
// calculate differential charts
// only if this is not the first time we run
- if(dt) {
+ if(likely(dt)) {
if( (d->do_iotime == CONFIG_ONDEMAND_YES || (d->do_iotime == CONFIG_ONDEMAND_ONDEMAND && (readms || writems))) &&
(d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
st = rrdset_find_bytype("disk_await", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_await", disk, NULL, family, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ABSOLUTE);
rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "reads", (reads - last_reads) ? (readms - last_readms) / (reads - last_reads) : 0);
rrddim_set(st, "writes", (writes - last_writes) ? (writems - last_writems) / (writes - last_writes) : 0);
if( (d->do_io == CONFIG_ONDEMAND_YES || (d->do_io == CONFIG_ONDEMAND_ONDEMAND && (readsectors || writesectors))) &&
(d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
st = rrdset_find_bytype("disk_avgsz", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_avgsz", disk, NULL, family, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
st->isdetail = 1;
rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRDDIM_ABSOLUTE);
rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "reads", (reads - last_reads) ? (readsectors - last_readsectors) / (reads - last_reads) : 0);
rrddim_set(st, "writes", (writes - last_writes) ? (writesectors - last_writesectors) / (writes - last_writes) : 0);
if( (d->do_util == CONFIG_ONDEMAND_YES || (d->do_util == CONFIG_ONDEMAND_ONDEMAND && busy_ms)) &&
(d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
st = rrdset_find_bytype("disk_svctm", disk);
- if(!st) {
+ if(unlikely(!st)) {
st = rrdset_create("disk_svctm", disk, NULL, family, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
st->isdetail = 1;
rrddim_add(st, "svctm", NULL, 1, 1, RRDDIM_ABSOLUTE);
}
- else rrdset_next_usec(st, dt);
+ else rrdset_next(st);
rrddim_set(st, "svctm", ((reads - last_reads) + (writes - last_writes)) ? (busy_ms - last_busy_ms) / ((reads - last_reads) + (writes - last_writes)) : 0);
rrdset_done(st);
// --------------------------------------------------------------------------
// space metrics
- if(d->mount_point && (d->do_space || d->do_inodes) ) {
+ if(unlikely( d->mount_point && (d->do_space || d->do_inodes) )) {
do_disk_space_stats(d, d->mount_point, disk, disk, family, update_every, dt);
}
*/