X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdisk.c;h=58a1c189563f4d5ff5fcb01331b0f1eef51d9e5a;hb=865f2eb31e8264edd9337bc63ac59f6c2fa3b5a7;hp=2c0d8b595dfe391e298b2582bd93cdd024c7c778;hpb=10139cda6f68ae1f921d79c930dd85944afb74a3;p=collectd.git diff --git a/src/disk.c b/src/disk.c index 2c0d8b59..58a1c189 100644 --- a/src/disk.c +++ b/src/disk.c @@ -28,31 +28,31 @@ #include "utils_ignorelist.h" #if HAVE_MACH_MACH_TYPES_H -# include +#include #endif #if HAVE_MACH_MACH_INIT_H -# include +#include #endif #if HAVE_MACH_MACH_ERROR_H -# include +#include #endif #if HAVE_MACH_MACH_PORT_H -# include +#include #endif #if HAVE_COREFOUNDATION_COREFOUNDATION_H -# include +#include #endif #if HAVE_IOKIT_IOKITLIB_H -# include +#include #endif #if HAVE_IOKIT_IOTYPES_H -# include +#include #endif #if HAVE_IOKIT_STORAGE_IOBLOCKSTORAGEDRIVER_H -# include +#include #endif #if HAVE_IOKIT_IOBSD_H -# include +#include #endif #if KERNEL_FREEBSD #include @@ -60,22 +60,22 @@ #endif #if HAVE_LIMITS_H -# include +#include #endif #ifndef UINT_MAX -# define UINT_MAX 4294967295U +#define UINT_MAX 4294967295U #endif #if HAVE_STATGRAB_H -# include +#include #endif #if HAVE_PERFSTAT -# ifndef _AIXVERSION_610 -# include -# endif -# include -# include +#ifndef _AIXVERSION_610 +#include +#endif +#include +#include #endif #if HAVE_IOKIT_IOKITLIB_H @@ -86,32 +86,31 @@ static _Bool use_bsd_name = 0; /* #endif HAVE_IOKIT_IOKITLIB_H */ #elif KERNEL_LINUX -typedef struct diskstats -{ - char *name; +typedef struct diskstats { + char *name; - /* This overflows in roughly 1361 years */ - unsigned int poll_count; + /* This overflows in roughly 1361 years */ + unsigned int poll_count; - derive_t read_sectors; - derive_t write_sectors; + derive_t read_sectors; + derive_t write_sectors; - derive_t read_bytes; - derive_t write_bytes; + derive_t read_bytes; + derive_t write_bytes; - derive_t read_ops; - derive_t write_ops; - derive_t read_time; - derive_t write_time; + derive_t read_ops; + derive_t write_ops; + derive_t read_time; + derive_t write_time; - derive_t avg_read_time; - derive_t avg_write_time; + derive_t avg_read_time; + derive_t avg_write_time; - _Bool has_merged; - _Bool has_in_progress; - _Bool has_io_time; + _Bool has_merged; + _Bool has_in_progress; + _Bool has_io_time; - struct diskstats *next; + struct diskstats *next; } diskstats_t; static diskstats_t *disklist; @@ -131,235 +130,202 @@ static int numdisk = 0; /* #endif HAVE_LIBSTATGRAB */ #elif HAVE_PERFSTAT -static perfstat_disk_t * stat_disk; +static perfstat_disk_t *stat_disk; static int numdisk; static int pnumdisk; /* #endif HAVE_PERFSTAT */ #else -# error "No applicable input method." +#error "No applicable input method." #endif -#if HAVE_LIBUDEV +#if HAVE_UDEV_H #include static char *conf_udev_name_attr = NULL; static struct udev *handle_udev; #endif -static const char *config_keys[] = -{ - "Disk", - "UseBSDName", - "IgnoreSelected", - "UdevNameAttr" -}; -static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); +static const char *config_keys[] = {"Disk", "UseBSDName", "IgnoreSelected", + "UdevNameAttr"}; +static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); static ignorelist_t *ignorelist = NULL; -static int disk_config (const char *key, const char *value) -{ +static int disk_config(const char *key, const char *value) { if (ignorelist == NULL) - ignorelist = ignorelist_create (/* invert = */ 1); + ignorelist = ignorelist_create(/* invert = */ 1); if (ignorelist == NULL) return (1); - if (strcasecmp ("Disk", key) == 0) - { - ignorelist_add (ignorelist, value); - } - else if (strcasecmp ("IgnoreSelected", key) == 0) - { + if (strcasecmp("Disk", key) == 0) { + ignorelist_add(ignorelist, value); + } else if (strcasecmp("IgnoreSelected", key) == 0) { int invert = 1; - if (IS_TRUE (value)) + if (IS_TRUE(value)) invert = 0; - ignorelist_set_invert (ignorelist, invert); - } - else if (strcasecmp ("UseBSDName", key) == 0) - { + ignorelist_set_invert(ignorelist, invert); + } else if (strcasecmp("UseBSDName", key) == 0) { #if HAVE_IOKIT_IOKITLIB_H - use_bsd_name = IS_TRUE (value) ? 1 : 0; + use_bsd_name = IS_TRUE(value) ? 1 : 0; #else - WARNING ("disk plugin: The \"UseBSDName\" option is only supported " - "on Mach / Mac OS X and will be ignored."); + WARNING("disk plugin: The \"UseBSDName\" option is only supported " + "on Mach / Mac OS X and will be ignored."); #endif - } - else if (strcasecmp ("UdevNameAttr", key) == 0) - { -#if HAVE_LIBUDEV - if (conf_udev_name_attr != NULL) - { - free (conf_udev_name_attr); + } else if (strcasecmp("UdevNameAttr", key) == 0) { +#if HAVE_UDEV_H + if (conf_udev_name_attr != NULL) { + free(conf_udev_name_attr); conf_udev_name_attr = NULL; } - if ((conf_udev_name_attr = strdup (value)) == NULL) + if ((conf_udev_name_attr = strdup(value)) == NULL) return (1); #else - WARNING ("disk plugin: The \"UdevNameAttr\" option is only supported " - "if collectd is built with libudev support"); + WARNING("disk plugin: The \"UdevNameAttr\" option is only supported " + "if collectd is built with libudev support"); #endif - } - else - { + } else { return (-1); } return (0); } /* int disk_config */ -static int disk_init (void) -{ +static int disk_init(void) { #if HAVE_IOKIT_IOKITLIB_H - kern_return_t status; - - if (io_master_port != MACH_PORT_NULL) - { - mach_port_deallocate (mach_task_self (), - io_master_port); - io_master_port = MACH_PORT_NULL; - } - - status = IOMasterPort (MACH_PORT_NULL, &io_master_port); - if (status != kIOReturnSuccess) - { - ERROR ("IOMasterPort failed: %s", - mach_error_string (status)); - io_master_port = MACH_PORT_NULL; - return (-1); - } + kern_return_t status; + + if (io_master_port != MACH_PORT_NULL) { + mach_port_deallocate(mach_task_self(), io_master_port); + io_master_port = MACH_PORT_NULL; + } + + status = IOMasterPort(MACH_PORT_NULL, &io_master_port); + if (status != kIOReturnSuccess) { + ERROR("IOMasterPort failed: %s", mach_error_string(status)); + io_master_port = MACH_PORT_NULL; + return (-1); + } /* #endif HAVE_IOKIT_IOKITLIB_H */ #elif KERNEL_LINUX -#if HAVE_LIBUDEV - if (conf_udev_name_attr != NULL) - { - handle_udev = udev_new(); - if (handle_udev == NULL) { - ERROR ("disk plugin: udev_new() failed!"); - return (-1); - } - } -#endif /* HAVE_LIBUDEV */ +#if HAVE_UDEV_H + if (conf_udev_name_attr != NULL) { + handle_udev = udev_new(); + if (handle_udev == NULL) { + ERROR("disk plugin: udev_new() failed!"); + return (-1); + } + } +#endif /* HAVE_UDEV_H */ /* #endif KERNEL_LINUX */ #elif KERNEL_FREEBSD - int rv; - - rv = geom_gettree(&geom_tree); - if (rv != 0) { - ERROR ("geom_gettree() failed, returned %d", rv); - return (-1); - } - rv = geom_stats_open(); - if (rv != 0) { - ERROR ("geom_stats_open() failed, returned %d", rv); - return (-1); - } + int rv; + + rv = geom_gettree(&geom_tree); + if (rv != 0) { + ERROR("geom_gettree() failed, returned %d", rv); + return (-1); + } + rv = geom_stats_open(); + if (rv != 0) { + ERROR("geom_stats_open() failed, returned %d", rv); + return (-1); + } /* #endif KERNEL_FREEBSD */ #elif HAVE_LIBKSTAT - kstat_t *ksp_chain; - - numdisk = 0; - - if (kc == NULL) - return (-1); - - for (numdisk = 0, ksp_chain = kc->kc_chain; - (numdisk < MAX_NUMDISK) && (ksp_chain != NULL); - ksp_chain = ksp_chain->ks_next) - { - if (strncmp (ksp_chain->ks_class, "disk", 4) - && strncmp (ksp_chain->ks_class, "partition", 9)) - continue; - if (ksp_chain->ks_type != KSTAT_TYPE_IO) - continue; - ksp[numdisk++] = ksp_chain; - } + kstat_t *ksp_chain; + + numdisk = 0; + + if (kc == NULL) + return (-1); + + for (numdisk = 0, ksp_chain = kc->kc_chain; + (numdisk < MAX_NUMDISK) && (ksp_chain != NULL); + ksp_chain = ksp_chain->ks_next) { + if (strncmp(ksp_chain->ks_class, "disk", 4) && + strncmp(ksp_chain->ks_class, "partition", 9)) + continue; + if (ksp_chain->ks_type != KSTAT_TYPE_IO) + continue; + ksp[numdisk++] = ksp_chain; + } #endif /* HAVE_LIBKSTAT */ - return (0); + return (0); } /* int disk_init */ -static int disk_shutdown (void) -{ +static int disk_shutdown(void) { #if KERNEL_LINUX -#if HAVE_LIBUDEV - if (handle_udev != NULL) - udev_unref(handle_udev); -#endif /* HAVE_LIBUDEV */ +#if HAVE_UDEV_H + if (handle_udev != NULL) + udev_unref(handle_udev); +#endif /* HAVE_UDEV_H */ #endif /* KERNEL_LINUX */ - return (0); + return (0); } /* int disk_shutdown */ -static void disk_submit (const char *plugin_instance, - const char *type, - derive_t read, derive_t write) -{ - value_list_t vl = VALUE_LIST_INIT; - value_t values[] = { - { .derive = read }, - { .derive = write }, - }; - - vl.values = values; - vl.values_len = STATIC_ARRAY_SIZE (values); - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "disk", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, plugin_instance, - sizeof (vl.plugin_instance)); - sstrncpy (vl.type, type, sizeof (vl.type)); - - plugin_dispatch_values (&vl); +static void disk_submit(const char *plugin_instance, const char *type, + derive_t read, derive_t write) { + value_list_t vl = VALUE_LIST_INIT; + value_t values[] = { + {.derive = read}, {.derive = write}, + }; + + vl.values = values; + vl.values_len = STATIC_ARRAY_SIZE(values); + sstrncpy(vl.plugin, "disk", sizeof(vl.plugin)); + sstrncpy(vl.plugin_instance, plugin_instance, sizeof(vl.plugin_instance)); + sstrncpy(vl.type, type, sizeof(vl.type)); + + plugin_dispatch_values(&vl); } /* void disk_submit */ #if KERNEL_FREEBSD || KERNEL_LINUX -static void submit_io_time (char const *plugin_instance, derive_t io_time, derive_t weighted_time) -{ - value_list_t vl = VALUE_LIST_INIT; - value_t values[] = { - { .derive = io_time }, - { .derive = weighted_time }, - }; - - vl.values = values; - vl.values_len = STATIC_ARRAY_SIZE (values); - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "disk", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance)); - sstrncpy (vl.type, "disk_io_time", sizeof (vl.type)); - - plugin_dispatch_values (&vl); +static void submit_io_time(char const *plugin_instance, derive_t io_time, + derive_t weighted_time) { + value_list_t vl = VALUE_LIST_INIT; + value_t values[] = { + {.derive = io_time}, {.derive = weighted_time}, + }; + + vl.values = values; + vl.values_len = STATIC_ARRAY_SIZE(values); + sstrncpy(vl.plugin, "disk", sizeof(vl.plugin)); + sstrncpy(vl.plugin_instance, plugin_instance, sizeof(vl.plugin_instance)); + sstrncpy(vl.type, "disk_io_time", sizeof(vl.type)); + + plugin_dispatch_values(&vl); } /* void submit_io_time */ #endif /* KERNEL_FREEBSD || KERNEL_LINUX */ #if KERNEL_LINUX -static void submit_in_progress (char const *disk_name, gauge_t in_progress) -{ - value_list_t vl = VALUE_LIST_INIT; - - vl.values = &(value_t) { .gauge = in_progress }; - vl.values_len = 1; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "disk", sizeof (vl.plugin)); - sstrncpy (vl.plugin_instance, disk_name, sizeof (vl.plugin_instance)); - sstrncpy (vl.type, "pending_operations", sizeof (vl.type)); - - plugin_dispatch_values (&vl); +static void submit_in_progress(char const *disk_name, gauge_t in_progress) { + value_list_t vl = VALUE_LIST_INIT; + + vl.values = &(value_t){.gauge = in_progress}; + vl.values_len = 1; + sstrncpy(vl.plugin, "disk", sizeof(vl.plugin)); + sstrncpy(vl.plugin_instance, disk_name, sizeof(vl.plugin_instance)); + sstrncpy(vl.type, "pending_operations", sizeof(vl.type)); + + plugin_dispatch_values(&vl); } -static counter_t disk_calc_time_incr (counter_t delta_time, counter_t delta_ops) -{ - double interval = CDTIME_T_TO_DOUBLE (plugin_get_interval ()); - double avg_time = ((double) delta_time) / ((double) delta_ops); - double avg_time_incr = interval * avg_time; +static counter_t disk_calc_time_incr(counter_t delta_time, + counter_t delta_ops) { + double interval = CDTIME_T_TO_DOUBLE(plugin_get_interval()); + double avg_time = ((double)delta_time) / ((double)delta_ops); + double avg_time_incr = interval * avg_time; - return ((counter_t) (avg_time_incr + .5)); + return ((counter_t)(avg_time_incr + .5)); } #endif -#if HAVE_LIBUDEV +#if HAVE_UDEV_H /** * Attempt to provide an rename disk instance from an assigned udev attribute. * @@ -367,713 +333,699 @@ static counter_t disk_calc_time_incr (counter_t delta_time, counter_t delta_ops) * Otherwise it returns NULL. */ -static char *disk_udev_attr_name (struct udev *udev, char *disk_name, const char *attr) -{ - struct udev_device *dev; - const char *prop; - char *output = NULL; - - dev = udev_device_new_from_subsystem_sysname (udev, "block", disk_name); - if (dev != NULL) - { - prop = udev_device_get_property_value (dev, attr); - if (prop) { - output = strdup (prop); - DEBUG ("disk plugin: renaming %s => %s", disk_name, output); - } - udev_device_unref (dev); - } - return output; +static char *disk_udev_attr_name(struct udev *udev, char *disk_name, + const char *attr) { + struct udev_device *dev; + const char *prop; + char *output = NULL; + + dev = udev_device_new_from_subsystem_sysname(udev, "block", disk_name); + if (dev != NULL) { + prop = udev_device_get_property_value(dev, attr); + if (prop) { + output = strdup(prop); + DEBUG("disk plugin: renaming %s => %s", disk_name, output); + } + udev_device_unref(dev); + } + return output; } #endif #if HAVE_IOKIT_IOKITLIB_H -static signed long long dict_get_value (CFDictionaryRef dict, const char *key) -{ - signed long long val_int; - CFNumberRef val_obj; - CFStringRef key_obj; - - /* `key_obj' needs to be released. */ - key_obj = CFStringCreateWithCString (kCFAllocatorDefault, key, - kCFStringEncodingASCII); - if (key_obj == NULL) - { - DEBUG ("CFStringCreateWithCString (%s) failed.", key); - return (-1LL); - } - - /* get => we don't need to release (== free) the object */ - val_obj = (CFNumberRef) CFDictionaryGetValue (dict, key_obj); - - CFRelease (key_obj); - - if (val_obj == NULL) - { - DEBUG ("CFDictionaryGetValue (%s) failed.", key); - return (-1LL); - } - - if (!CFNumberGetValue (val_obj, kCFNumberSInt64Type, &val_int)) - { - DEBUG ("CFNumberGetValue (%s) failed.", key); - return (-1LL); - } - - return (val_int); +static signed long long dict_get_value(CFDictionaryRef dict, const char *key) { + signed long long val_int; + CFNumberRef val_obj; + CFStringRef key_obj; + + /* `key_obj' needs to be released. */ + key_obj = CFStringCreateWithCString(kCFAllocatorDefault, key, + kCFStringEncodingASCII); + if (key_obj == NULL) { + DEBUG("CFStringCreateWithCString (%s) failed.", key); + return (-1LL); + } + + /* get => we don't need to release (== free) the object */ + val_obj = (CFNumberRef)CFDictionaryGetValue(dict, key_obj); + + CFRelease(key_obj); + + if (val_obj == NULL) { + DEBUG("CFDictionaryGetValue (%s) failed.", key); + return (-1LL); + } + + if (!CFNumberGetValue(val_obj, kCFNumberSInt64Type, &val_int)) { + DEBUG("CFNumberGetValue (%s) failed.", key); + return (-1LL); + } + + return (val_int); } #endif /* HAVE_IOKIT_IOKITLIB_H */ -static int disk_read (void) -{ +static int disk_read(void) { #if HAVE_IOKIT_IOKITLIB_H - io_registry_entry_t disk; - io_registry_entry_t disk_child; - io_iterator_t disk_list; - CFMutableDictionaryRef props_dict, child_dict; - CFDictionaryRef stats_dict; - CFStringRef tmp_cf_string_ref; - kern_return_t status; - - signed long long read_ops, read_byt, read_tme; - signed long long write_ops, write_byt, write_tme; - - int disk_major, disk_minor; - char disk_name[DATA_MAX_NAME_LEN]; - char child_disk_name_bsd[DATA_MAX_NAME_LEN], props_disk_name_bsd[DATA_MAX_NAME_LEN]; - - /* Get the list of all disk objects. */ - if (IOServiceGetMatchingServices (io_master_port, IOServiceMatching (kIOBlockStorageDriverClass), &disk_list) != kIOReturnSuccess) { - ERROR ("disk plugin: IOServiceGetMatchingServices failed."); - return (-1); - } - - while ((disk = IOIteratorNext (disk_list)) != 0) { - props_dict = NULL; - stats_dict = NULL; - child_dict = NULL; - - /* get child of disk entry and corresponding property dictionary */ - if ((status = IORegistryEntryGetChildEntry (disk, kIOServicePlane, &disk_child)) != kIOReturnSuccess) { - /* This fails for example for DVD/CD drives, which we want to ignore anyway */ - DEBUG ("IORegistryEntryGetChildEntry (disk) failed: 0x%08x", status); - IOObjectRelease (disk); - continue; - } - if (IORegistryEntryCreateCFProperties (disk_child, (CFMutableDictionaryRef *) &child_dict, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess || child_dict == NULL) { - ERROR ("disk plugin: IORegistryEntryCreateCFProperties (disk_child) failed."); - IOObjectRelease (disk_child); - IOObjectRelease (disk); - continue; - } - - /* extract name and major/minor numbers */ - memset (child_disk_name_bsd, 0, sizeof (child_disk_name_bsd)); - tmp_cf_string_ref = (CFStringRef) CFDictionaryGetValue (child_dict, CFSTR(kIOBSDNameKey)); - if (tmp_cf_string_ref) { - assert (CFGetTypeID (tmp_cf_string_ref) == CFStringGetTypeID ()); - CFStringGetCString (tmp_cf_string_ref, child_disk_name_bsd, sizeof (child_disk_name_bsd), kCFStringEncodingUTF8); - } - disk_major = (int) dict_get_value (child_dict, kIOBSDMajorKey); - disk_minor = (int) dict_get_value (child_dict, kIOBSDMinorKey); - DEBUG ("disk plugin: child_disk_name_bsd=\"%s\" major=%d minor=%d", child_disk_name_bsd, disk_major, disk_minor); - CFRelease (child_dict); - IOObjectRelease (disk_child); - - /* get property dictionary of the disk entry itself */ - if (IORegistryEntryCreateCFProperties (disk, (CFMutableDictionaryRef *) &props_dict, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess || props_dict == NULL) { - ERROR ("disk-plugin: IORegistryEntryCreateCFProperties failed."); - IOObjectRelease (disk); - continue; - } - - /* extract name and stats dictionary */ - memset (props_disk_name_bsd, 0, sizeof (props_disk_name_bsd)); - tmp_cf_string_ref = (CFStringRef) CFDictionaryGetValue (props_dict, CFSTR(kIOBSDNameKey)); - if (tmp_cf_string_ref) { - assert (CFGetTypeID (tmp_cf_string_ref) == CFStringGetTypeID ()); - CFStringGetCString (tmp_cf_string_ref, props_disk_name_bsd, sizeof (props_disk_name_bsd), kCFStringEncodingUTF8); - } - stats_dict = (CFDictionaryRef) CFDictionaryGetValue (props_dict, CFSTR (kIOBlockStorageDriverStatisticsKey)); - if (stats_dict == NULL) { - ERROR ("disk plugin: CFDictionaryGetValue (%s) failed.", kIOBlockStorageDriverStatisticsKey); - CFRelease (props_dict); - IOObjectRelease (disk); - continue; - } - DEBUG ("disk plugin: props_disk_name_bsd=\"%s\"", props_disk_name_bsd); - - /* choose name */ - if (use_bsd_name) { - if (child_disk_name_bsd[0] != 0) - sstrncpy (disk_name, child_disk_name_bsd, sizeof (disk_name)); - else if (props_disk_name_bsd[0] != 0) - sstrncpy (disk_name, props_disk_name_bsd, sizeof (disk_name)); - else { - ERROR ("disk plugin: can't find bsd disk name."); - ssnprintf (disk_name, sizeof (disk_name), "%i-%i", disk_major, disk_minor); - } - } - else - ssnprintf (disk_name, sizeof (disk_name), "%i-%i", disk_major, disk_minor); - - DEBUG ("disk plugin: disk_name = \"%s\"", disk_name); - - /* check the name against ignore list */ - if (ignorelist_match (ignorelist, disk_name) != 0) { - CFRelease (props_dict); - IOObjectRelease (disk); - continue; - } - - /* extract the stats */ - read_ops = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsReadsKey); - read_byt = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsBytesReadKey); - read_tme = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsTotalReadTimeKey); - write_ops = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsWritesKey); - write_byt = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsBytesWrittenKey); - write_tme = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsTotalWriteTimeKey); - CFRelease (props_dict); - IOObjectRelease (disk); - - /* and submit */ - if ((read_byt != -1LL) || (write_byt != -1LL)) - disk_submit (disk_name, "disk_octets", read_byt, write_byt); - if ((read_ops != -1LL) || (write_ops != -1LL)) - disk_submit (disk_name, "disk_ops", read_ops, write_ops); - if ((read_tme != -1LL) || (write_tme != -1LL)) - disk_submit (disk_name, "disk_time", read_tme / 1000, write_tme / 1000); - - } - IOObjectRelease (disk_list); + io_registry_entry_t disk; + io_registry_entry_t disk_child; + io_iterator_t disk_list; + CFMutableDictionaryRef props_dict, child_dict; + CFDictionaryRef stats_dict; + CFStringRef tmp_cf_string_ref; + kern_return_t status; + + signed long long read_ops, read_byt, read_tme; + signed long long write_ops, write_byt, write_tme; + + int disk_major, disk_minor; + char disk_name[DATA_MAX_NAME_LEN]; + char child_disk_name_bsd[DATA_MAX_NAME_LEN], + props_disk_name_bsd[DATA_MAX_NAME_LEN]; + + /* Get the list of all disk objects. */ + if (IOServiceGetMatchingServices( + io_master_port, IOServiceMatching(kIOBlockStorageDriverClass), + &disk_list) != kIOReturnSuccess) { + ERROR("disk plugin: IOServiceGetMatchingServices failed."); + return (-1); + } + + while ((disk = IOIteratorNext(disk_list)) != 0) { + props_dict = NULL; + stats_dict = NULL; + child_dict = NULL; + + /* get child of disk entry and corresponding property dictionary */ + if ((status = IORegistryEntryGetChildEntry( + disk, kIOServicePlane, &disk_child)) != kIOReturnSuccess) { + /* This fails for example for DVD/CD drives, which we want to ignore + * anyway */ + DEBUG("IORegistryEntryGetChildEntry (disk) failed: 0x%08x", status); + IOObjectRelease(disk); + continue; + } + if (IORegistryEntryCreateCFProperties( + disk_child, (CFMutableDictionaryRef *)&child_dict, + kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess || + child_dict == NULL) { + ERROR("disk plugin: IORegistryEntryCreateCFProperties (disk_child) " + "failed."); + IOObjectRelease(disk_child); + IOObjectRelease(disk); + continue; + } + + /* extract name and major/minor numbers */ + memset(child_disk_name_bsd, 0, sizeof(child_disk_name_bsd)); + tmp_cf_string_ref = + (CFStringRef)CFDictionaryGetValue(child_dict, CFSTR(kIOBSDNameKey)); + if (tmp_cf_string_ref) { + assert(CFGetTypeID(tmp_cf_string_ref) == CFStringGetTypeID()); + CFStringGetCString(tmp_cf_string_ref, child_disk_name_bsd, + sizeof(child_disk_name_bsd), kCFStringEncodingUTF8); + } + disk_major = (int)dict_get_value(child_dict, kIOBSDMajorKey); + disk_minor = (int)dict_get_value(child_dict, kIOBSDMinorKey); + DEBUG("disk plugin: child_disk_name_bsd=\"%s\" major=%d minor=%d", + child_disk_name_bsd, disk_major, disk_minor); + CFRelease(child_dict); + IOObjectRelease(disk_child); + + /* get property dictionary of the disk entry itself */ + if (IORegistryEntryCreateCFProperties( + disk, (CFMutableDictionaryRef *)&props_dict, kCFAllocatorDefault, + kNilOptions) != kIOReturnSuccess || + props_dict == NULL) { + ERROR("disk-plugin: IORegistryEntryCreateCFProperties failed."); + IOObjectRelease(disk); + continue; + } + + /* extract name and stats dictionary */ + memset(props_disk_name_bsd, 0, sizeof(props_disk_name_bsd)); + tmp_cf_string_ref = + (CFStringRef)CFDictionaryGetValue(props_dict, CFSTR(kIOBSDNameKey)); + if (tmp_cf_string_ref) { + assert(CFGetTypeID(tmp_cf_string_ref) == CFStringGetTypeID()); + CFStringGetCString(tmp_cf_string_ref, props_disk_name_bsd, + sizeof(props_disk_name_bsd), kCFStringEncodingUTF8); + } + stats_dict = (CFDictionaryRef)CFDictionaryGetValue( + props_dict, CFSTR(kIOBlockStorageDriverStatisticsKey)); + if (stats_dict == NULL) { + ERROR("disk plugin: CFDictionaryGetValue (%s) failed.", + kIOBlockStorageDriverStatisticsKey); + CFRelease(props_dict); + IOObjectRelease(disk); + continue; + } + DEBUG("disk plugin: props_disk_name_bsd=\"%s\"", props_disk_name_bsd); + + /* choose name */ + if (use_bsd_name) { + if (child_disk_name_bsd[0] != 0) + sstrncpy(disk_name, child_disk_name_bsd, sizeof(disk_name)); + else if (props_disk_name_bsd[0] != 0) + sstrncpy(disk_name, props_disk_name_bsd, sizeof(disk_name)); + else { + ERROR("disk plugin: can't find bsd disk name."); + ssnprintf(disk_name, sizeof(disk_name), "%i-%i", disk_major, + disk_minor); + } + } else + ssnprintf(disk_name, sizeof(disk_name), "%i-%i", disk_major, disk_minor); + + DEBUG("disk plugin: disk_name = \"%s\"", disk_name); + + /* check the name against ignore list */ + if (ignorelist_match(ignorelist, disk_name) != 0) { + CFRelease(props_dict); + IOObjectRelease(disk); + continue; + } + + /* extract the stats */ + read_ops = + dict_get_value(stats_dict, kIOBlockStorageDriverStatisticsReadsKey); + read_byt = + dict_get_value(stats_dict, kIOBlockStorageDriverStatisticsBytesReadKey); + read_tme = dict_get_value(stats_dict, + kIOBlockStorageDriverStatisticsTotalReadTimeKey); + write_ops = + dict_get_value(stats_dict, kIOBlockStorageDriverStatisticsWritesKey); + write_byt = dict_get_value(stats_dict, + kIOBlockStorageDriverStatisticsBytesWrittenKey); + write_tme = dict_get_value( + stats_dict, kIOBlockStorageDriverStatisticsTotalWriteTimeKey); + CFRelease(props_dict); + IOObjectRelease(disk); + + /* and submit */ + if ((read_byt != -1LL) || (write_byt != -1LL)) + disk_submit(disk_name, "disk_octets", read_byt, write_byt); + if ((read_ops != -1LL) || (write_ops != -1LL)) + disk_submit(disk_name, "disk_ops", read_ops, write_ops); + if ((read_tme != -1LL) || (write_tme != -1LL)) + disk_submit(disk_name, "disk_time", read_tme / 1000, write_tme / 1000); + } + IOObjectRelease(disk_list); /* #endif HAVE_IOKIT_IOKITLIB_H */ #elif KERNEL_FREEBSD - int retry, dirty; - - void *snap = NULL; - struct devstat *snap_iter; - - struct gident *geom_id; - - const char *disk_name; - long double read_time, write_time, busy_time, total_duration; - - for (retry = 0, dirty = 1; retry < 5 && dirty == 1; retry++) { - if (snap != NULL) - geom_stats_snapshot_free(snap); - - /* Get a fresh copy of stats snapshot */ - snap = geom_stats_snapshot_get(); - if (snap == NULL) { - ERROR("disk plugin: geom_stats_snapshot_get() failed."); - return (-1); - } - - /* Check if we have dirty read from this snapshot */ - dirty = 0; - geom_stats_snapshot_reset(snap); - while ((snap_iter = geom_stats_snapshot_next(snap)) != NULL) { - if (snap_iter->id == NULL) - continue; - geom_id = geom_lookupid(&geom_tree, snap_iter->id); - - /* New device? refresh GEOM tree */ - if (geom_id == NULL) { - geom_deletetree(&geom_tree); - if (geom_gettree(&geom_tree) != 0) { - ERROR("disk plugin: geom_gettree() failed"); - geom_stats_snapshot_free(snap); - return (-1); - } - geom_id = geom_lookupid(&geom_tree, snap_iter->id); - } - /* - * This should be rare: the device come right before we take the - * snapshot and went away right after it. We will handle this - * case later, so don't mark dirty but silently ignore it. - */ - if (geom_id == NULL) - continue; - - /* Only collect PROVIDER data */ - if (geom_id->lg_what != ISPROVIDER) - continue; - - /* Only collect data when rank is 1 (physical devices) */ - if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1) - continue; - - /* Check if this is a dirty read quit for another try */ - if (snap_iter->sequence0 != snap_iter->sequence1) { - dirty = 1; - break; - } - } - } - - /* Reset iterator */ - geom_stats_snapshot_reset(snap); - for (;;) { - snap_iter = geom_stats_snapshot_next(snap); - if (snap_iter == NULL) - break; - - if (snap_iter->id == NULL) - continue; - geom_id = geom_lookupid(&geom_tree, snap_iter->id); - if (geom_id == NULL) - continue; - if (geom_id->lg_what != ISPROVIDER) - continue; - if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1) - continue; - /* Skip dirty reads, if present */ - if (dirty && (snap_iter->sequence0 != snap_iter->sequence1)) - continue; - - disk_name = ((struct gprovider *)geom_id->lg_ptr)->lg_name; - - if (ignorelist_match (ignorelist, disk_name) != 0) - continue; - - if ((snap_iter->bytes[DEVSTAT_READ] != 0) || (snap_iter->bytes[DEVSTAT_WRITE] != 0)) { - disk_submit(disk_name, "disk_octets", - (derive_t)snap_iter->bytes[DEVSTAT_READ], - (derive_t)snap_iter->bytes[DEVSTAT_WRITE]); - } - - if ((snap_iter->operations[DEVSTAT_READ] != 0) || (snap_iter->operations[DEVSTAT_WRITE] != 0)) { - disk_submit(disk_name, "disk_ops", - (derive_t)snap_iter->operations[DEVSTAT_READ], - (derive_t)snap_iter->operations[DEVSTAT_WRITE]); - } - - read_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_READ], NULL); - write_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_WRITE], NULL); - if ((read_time != 0) || (write_time != 0)) { - disk_submit (disk_name, "disk_time", - (derive_t)(read_time*1000), (derive_t)(write_time*1000)); - } - if (devstat_compute_statistics(snap_iter, NULL, 1.0, - DSM_TOTAL_BUSY_TIME, &busy_time, - DSM_TOTAL_DURATION, &total_duration, - DSM_NONE) != 0) { - WARNING("%s", devstat_errbuf); - } - else - { - submit_io_time(disk_name, busy_time, total_duration); - } - } - geom_stats_snapshot_free(snap); + int retry, dirty; + + void *snap = NULL; + struct devstat *snap_iter; + + struct gident *geom_id; + + const char *disk_name; + long double read_time, write_time, busy_time, total_duration; + + for (retry = 0, dirty = 1; retry < 5 && dirty == 1; retry++) { + if (snap != NULL) + geom_stats_snapshot_free(snap); + + /* Get a fresh copy of stats snapshot */ + snap = geom_stats_snapshot_get(); + if (snap == NULL) { + ERROR("disk plugin: geom_stats_snapshot_get() failed."); + return (-1); + } + + /* Check if we have dirty read from this snapshot */ + dirty = 0; + geom_stats_snapshot_reset(snap); + while ((snap_iter = geom_stats_snapshot_next(snap)) != NULL) { + if (snap_iter->id == NULL) + continue; + geom_id = geom_lookupid(&geom_tree, snap_iter->id); + + /* New device? refresh GEOM tree */ + if (geom_id == NULL) { + geom_deletetree(&geom_tree); + if (geom_gettree(&geom_tree) != 0) { + ERROR("disk plugin: geom_gettree() failed"); + geom_stats_snapshot_free(snap); + return (-1); + } + geom_id = geom_lookupid(&geom_tree, snap_iter->id); + } + /* + * This should be rare: the device come right before we take the + * snapshot and went away right after it. We will handle this + * case later, so don't mark dirty but silently ignore it. + */ + if (geom_id == NULL) + continue; + + /* Only collect PROVIDER data */ + if (geom_id->lg_what != ISPROVIDER) + continue; + + /* Only collect data when rank is 1 (physical devices) */ + if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1) + continue; + + /* Check if this is a dirty read quit for another try */ + if (snap_iter->sequence0 != snap_iter->sequence1) { + dirty = 1; + break; + } + } + } + + /* Reset iterator */ + geom_stats_snapshot_reset(snap); + for (;;) { + snap_iter = geom_stats_snapshot_next(snap); + if (snap_iter == NULL) + break; + + if (snap_iter->id == NULL) + continue; + geom_id = geom_lookupid(&geom_tree, snap_iter->id); + if (geom_id == NULL) + continue; + if (geom_id->lg_what != ISPROVIDER) + continue; + if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1) + continue; + /* Skip dirty reads, if present */ + if (dirty && (snap_iter->sequence0 != snap_iter->sequence1)) + continue; + + disk_name = ((struct gprovider *)geom_id->lg_ptr)->lg_name; + + if (ignorelist_match(ignorelist, disk_name) != 0) + continue; + + if ((snap_iter->bytes[DEVSTAT_READ] != 0) || + (snap_iter->bytes[DEVSTAT_WRITE] != 0)) { + disk_submit(disk_name, "disk_octets", + (derive_t)snap_iter->bytes[DEVSTAT_READ], + (derive_t)snap_iter->bytes[DEVSTAT_WRITE]); + } + + if ((snap_iter->operations[DEVSTAT_READ] != 0) || + (snap_iter->operations[DEVSTAT_WRITE] != 0)) { + disk_submit(disk_name, "disk_ops", + (derive_t)snap_iter->operations[DEVSTAT_READ], + (derive_t)snap_iter->operations[DEVSTAT_WRITE]); + } + + read_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_READ], NULL); + write_time = + devstat_compute_etime(&snap_iter->duration[DEVSTAT_WRITE], NULL); + if ((read_time != 0) || (write_time != 0)) { + disk_submit(disk_name, "disk_time", (derive_t)(read_time * 1000), + (derive_t)(write_time * 1000)); + } + if (devstat_compute_statistics(snap_iter, NULL, 1.0, DSM_TOTAL_BUSY_TIME, + &busy_time, DSM_TOTAL_DURATION, + &total_duration, DSM_NONE) != 0) { + WARNING("%s", devstat_errbuf); + } else { + submit_io_time(disk_name, busy_time, total_duration); + } + } + geom_stats_snapshot_free(snap); #elif KERNEL_LINUX - FILE *fh; - char buffer[1024]; - - char *fields[32]; - int numfields; - int fieldshift = 0; - - int minor = 0; - - derive_t read_sectors = 0; - derive_t write_sectors = 0; - - derive_t read_ops = 0; - derive_t read_merged = 0; - derive_t read_time = 0; - derive_t write_ops = 0; - derive_t write_merged = 0; - derive_t write_time = 0; - gauge_t in_progress = NAN; - derive_t io_time = 0; - derive_t weighted_time = 0; - int is_disk = 0; - - diskstats_t *ds, *pre_ds; - - if ((fh = fopen ("/proc/diskstats", "r")) == NULL) - { - fh = fopen ("/proc/partitions", "r"); - if (fh == NULL) - { - ERROR ("disk plugin: fopen (/proc/{diskstats,partitions}) failed."); - return (-1); - } - - /* Kernel is 2.4.* */ - fieldshift = 1; - } - - while (fgets (buffer, sizeof (buffer), fh) != NULL) - { - char *disk_name; - char *output_name; - - numfields = strsplit (buffer, fields, 32); - - if ((numfields != (14 + fieldshift)) && (numfields != 7)) - continue; - - minor = atoll (fields[1]); - - disk_name = fields[2 + fieldshift]; - - for (ds = disklist, pre_ds = disklist; ds != NULL; pre_ds = ds, ds = ds->next) - if (strcmp (disk_name, ds->name) == 0) - break; - - if (ds == NULL) - { - if ((ds = (diskstats_t *) calloc (1, sizeof (diskstats_t))) == NULL) - continue; - - if ((ds->name = strdup (disk_name)) == NULL) - { - free (ds); - continue; - } - - if (pre_ds == NULL) - disklist = ds; - else - pre_ds->next = ds; - } - - is_disk = 0; - if (numfields == 7) - { - /* Kernel 2.6, Partition */ - read_ops = atoll (fields[3]); - read_sectors = atoll (fields[4]); - write_ops = atoll (fields[5]); - write_sectors = atoll (fields[6]); - } - else if (numfields == (14 + fieldshift)) - { - read_ops = atoll (fields[3 + fieldshift]); - write_ops = atoll (fields[7 + fieldshift]); - - read_sectors = atoll (fields[5 + fieldshift]); - write_sectors = atoll (fields[9 + fieldshift]); - - if ((fieldshift == 0) || (minor == 0)) - { - is_disk = 1; - read_merged = atoll (fields[4 + fieldshift]); - read_time = atoll (fields[6 + fieldshift]); - write_merged = atoll (fields[8 + fieldshift]); - write_time = atoll (fields[10+ fieldshift]); - - in_progress = atof (fields[11 + fieldshift]); - - io_time = atof (fields[12 + fieldshift]); - weighted_time = atof (fields[13 + fieldshift]); - } - } - else - { - DEBUG ("numfields = %i; => unknown file format.", numfields); - continue; - } - - { - derive_t diff_read_sectors; - derive_t diff_write_sectors; - - /* If the counter wraps around, it's only 32 bits.. */ - if (read_sectors < ds->read_sectors) - diff_read_sectors = 1 + read_sectors - + (UINT_MAX - ds->read_sectors); - else - diff_read_sectors = read_sectors - ds->read_sectors; - if (write_sectors < ds->write_sectors) - diff_write_sectors = 1 + write_sectors - + (UINT_MAX - ds->write_sectors); - else - diff_write_sectors = write_sectors - ds->write_sectors; - - ds->read_bytes += 512 * diff_read_sectors; - ds->write_bytes += 512 * diff_write_sectors; - ds->read_sectors = read_sectors; - ds->write_sectors = write_sectors; - } - - /* Calculate the average time an io-op needs to complete */ - if (is_disk) - { - derive_t diff_read_ops; - derive_t diff_write_ops; - derive_t diff_read_time; - derive_t diff_write_time; - - if (read_ops < ds->read_ops) - diff_read_ops = 1 + read_ops - + (UINT_MAX - ds->read_ops); - else - diff_read_ops = read_ops - ds->read_ops; - DEBUG ("disk plugin: disk_name = %s; read_ops = %"PRIi64"; " - "ds->read_ops = %"PRIi64"; diff_read_ops = %"PRIi64";", - disk_name, - read_ops, ds->read_ops, diff_read_ops); - - if (write_ops < ds->write_ops) - diff_write_ops = 1 + write_ops - + (UINT_MAX - ds->write_ops); - else - diff_write_ops = write_ops - ds->write_ops; - - if (read_time < ds->read_time) - diff_read_time = 1 + read_time - + (UINT_MAX - ds->read_time); - else - diff_read_time = read_time - ds->read_time; - - if (write_time < ds->write_time) - diff_write_time = 1 + write_time - + (UINT_MAX - ds->write_time); - else - diff_write_time = write_time - ds->write_time; - - if (diff_read_ops != 0) - ds->avg_read_time += disk_calc_time_incr ( - diff_read_time, diff_read_ops); - if (diff_write_ops != 0) - ds->avg_write_time += disk_calc_time_incr ( - diff_write_time, diff_write_ops); - - ds->read_ops = read_ops; - ds->read_time = read_time; - ds->write_ops = write_ops; - ds->write_time = write_time; - - if (read_merged || write_merged) - ds->has_merged = 1; - - if (in_progress) - ds->has_in_progress = 1; - - if (io_time) - ds->has_io_time = 1; - - } /* if (is_disk) */ - - /* Don't write to the RRDs if we've just started.. */ - ds->poll_count++; - if (ds->poll_count <= 2) - { - DEBUG ("disk plugin: (ds->poll_count = %i) <= " - "(min_poll_count = 2); => Not writing.", - ds->poll_count); - continue; - } - - if ((read_ops == 0) && (write_ops == 0)) - { - DEBUG ("disk plugin: ((read_ops == 0) && " - "(write_ops == 0)); => Not writing."); - continue; - } - - output_name = disk_name; - -#if HAVE_LIBUDEV - char *alt_name = NULL; - if (conf_udev_name_attr != NULL) - { - alt_name = disk_udev_attr_name (handle_udev, disk_name, conf_udev_name_attr); - if (alt_name != NULL) - output_name = alt_name; - } -#endif + FILE *fh; + char buffer[1024]; + + char *fields[32]; + int numfields; + int fieldshift = 0; + + int minor = 0; + + derive_t read_sectors = 0; + derive_t write_sectors = 0; + + derive_t read_ops = 0; + derive_t read_merged = 0; + derive_t read_time = 0; + derive_t write_ops = 0; + derive_t write_merged = 0; + derive_t write_time = 0; + gauge_t in_progress = NAN; + derive_t io_time = 0; + derive_t weighted_time = 0; + int is_disk = 0; + + diskstats_t *ds, *pre_ds; + + if ((fh = fopen("/proc/diskstats", "r")) == NULL) { + fh = fopen("/proc/partitions", "r"); + if (fh == NULL) { + ERROR("disk plugin: fopen (/proc/{diskstats,partitions}) failed."); + return (-1); + } + + /* Kernel is 2.4.* */ + fieldshift = 1; + } + + while (fgets(buffer, sizeof(buffer), fh) != NULL) { + char *disk_name; + char *output_name; + + numfields = strsplit(buffer, fields, 32); + + if ((numfields != (14 + fieldshift)) && (numfields != 7)) + continue; + + minor = atoll(fields[1]); + + disk_name = fields[2 + fieldshift]; + + for (ds = disklist, pre_ds = disklist; ds != NULL; + pre_ds = ds, ds = ds->next) + if (strcmp(disk_name, ds->name) == 0) + break; + + if (ds == NULL) { + if ((ds = (diskstats_t *)calloc(1, sizeof(diskstats_t))) == NULL) + continue; + + if ((ds->name = strdup(disk_name)) == NULL) { + free(ds); + continue; + } + + if (pre_ds == NULL) + disklist = ds; + else + pre_ds->next = ds; + } + + is_disk = 0; + if (numfields == 7) { + /* Kernel 2.6, Partition */ + read_ops = atoll(fields[3]); + read_sectors = atoll(fields[4]); + write_ops = atoll(fields[5]); + write_sectors = atoll(fields[6]); + } else if (numfields == (14 + fieldshift)) { + read_ops = atoll(fields[3 + fieldshift]); + write_ops = atoll(fields[7 + fieldshift]); + + read_sectors = atoll(fields[5 + fieldshift]); + write_sectors = atoll(fields[9 + fieldshift]); + + if ((fieldshift == 0) || (minor == 0)) { + is_disk = 1; + read_merged = atoll(fields[4 + fieldshift]); + read_time = atoll(fields[6 + fieldshift]); + write_merged = atoll(fields[8 + fieldshift]); + write_time = atoll(fields[10 + fieldshift]); + + in_progress = atof(fields[11 + fieldshift]); + + io_time = atof(fields[12 + fieldshift]); + weighted_time = atof(fields[13 + fieldshift]); + } + } else { + DEBUG("numfields = %i; => unknown file format.", numfields); + continue; + } + + { + derive_t diff_read_sectors; + derive_t diff_write_sectors; + + /* If the counter wraps around, it's only 32 bits.. */ + if (read_sectors < ds->read_sectors) + diff_read_sectors = 1 + read_sectors + (UINT_MAX - ds->read_sectors); + else + diff_read_sectors = read_sectors - ds->read_sectors; + if (write_sectors < ds->write_sectors) + diff_write_sectors = 1 + write_sectors + (UINT_MAX - ds->write_sectors); + else + diff_write_sectors = write_sectors - ds->write_sectors; + + ds->read_bytes += 512 * diff_read_sectors; + ds->write_bytes += 512 * diff_write_sectors; + ds->read_sectors = read_sectors; + ds->write_sectors = write_sectors; + } + + /* Calculate the average time an io-op needs to complete */ + if (is_disk) { + derive_t diff_read_ops; + derive_t diff_write_ops; + derive_t diff_read_time; + derive_t diff_write_time; + + if (read_ops < ds->read_ops) + diff_read_ops = 1 + read_ops + (UINT_MAX - ds->read_ops); + else + diff_read_ops = read_ops - ds->read_ops; + DEBUG("disk plugin: disk_name = %s; read_ops = %" PRIi64 "; " + "ds->read_ops = %" PRIi64 "; diff_read_ops = %" PRIi64 ";", + disk_name, read_ops, ds->read_ops, diff_read_ops); + + if (write_ops < ds->write_ops) + diff_write_ops = 1 + write_ops + (UINT_MAX - ds->write_ops); + else + diff_write_ops = write_ops - ds->write_ops; + + if (read_time < ds->read_time) + diff_read_time = 1 + read_time + (UINT_MAX - ds->read_time); + else + diff_read_time = read_time - ds->read_time; + + if (write_time < ds->write_time) + diff_write_time = 1 + write_time + (UINT_MAX - ds->write_time); + else + diff_write_time = write_time - ds->write_time; + + if (diff_read_ops != 0) + ds->avg_read_time += disk_calc_time_incr(diff_read_time, diff_read_ops); + if (diff_write_ops != 0) + ds->avg_write_time += + disk_calc_time_incr(diff_write_time, diff_write_ops); + + ds->read_ops = read_ops; + ds->read_time = read_time; + ds->write_ops = write_ops; + ds->write_time = write_time; + + if (read_merged || write_merged) + ds->has_merged = 1; + + if (in_progress) + ds->has_in_progress = 1; + + if (io_time) + ds->has_io_time = 1; + + } /* if (is_disk) */ + + /* Don't write to the RRDs if we've just started.. */ + ds->poll_count++; + if (ds->poll_count <= 2) { + DEBUG("disk plugin: (ds->poll_count = %i) <= " + "(min_poll_count = 2); => Not writing.", + ds->poll_count); + continue; + } - if (ignorelist_match (ignorelist, output_name) != 0) - { -#if HAVE_LIBUDEV - /* release udev-based alternate name, if allocated */ - sfree (alt_name); + if ((read_ops == 0) && (write_ops == 0)) { + DEBUG("disk plugin: ((read_ops == 0) && " + "(write_ops == 0)); => Not writing."); + continue; + } + + output_name = disk_name; + +#if HAVE_UDEV_H + char *alt_name = NULL; + if (conf_udev_name_attr != NULL) { + alt_name = + disk_udev_attr_name(handle_udev, disk_name, conf_udev_name_attr); + if (alt_name != NULL) + output_name = alt_name; + } #endif - continue; - } - - if ((ds->read_bytes != 0) || (ds->write_bytes != 0)) - disk_submit (output_name, "disk_octets", - ds->read_bytes, ds->write_bytes); - - if ((ds->read_ops != 0) || (ds->write_ops != 0)) - disk_submit (output_name, "disk_ops", - read_ops, write_ops); - - if ((ds->avg_read_time != 0) || (ds->avg_write_time != 0)) - disk_submit (output_name, "disk_time", - ds->avg_read_time, ds->avg_write_time); - - if (is_disk) - { - if (ds->has_merged) - disk_submit (output_name, "disk_merged", - read_merged, write_merged); - if (ds->has_in_progress) - submit_in_progress (output_name, in_progress); - if (ds->has_io_time) - submit_io_time (output_name, io_time, weighted_time); - } /* if (is_disk) */ - -#if HAVE_LIBUDEV - /* release udev-based alternate name, if allocated */ - sfree (alt_name); + + if (ignorelist_match(ignorelist, output_name) != 0) { +#if HAVE_UDEV_H + /* release udev-based alternate name, if allocated */ + sfree(alt_name); #endif - } /* while (fgets (buffer, sizeof (buffer), fh) != NULL) */ + continue; + } + + if ((ds->read_bytes != 0) || (ds->write_bytes != 0)) + disk_submit(output_name, "disk_octets", ds->read_bytes, ds->write_bytes); + + if ((ds->read_ops != 0) || (ds->write_ops != 0)) + disk_submit(output_name, "disk_ops", read_ops, write_ops); + if ((ds->avg_read_time != 0) || (ds->avg_write_time != 0)) + disk_submit(output_name, "disk_time", ds->avg_read_time, + ds->avg_write_time); - fclose (fh); + if (is_disk) { + if (ds->has_merged) + disk_submit(output_name, "disk_merged", read_merged, write_merged); + if (ds->has_in_progress) + submit_in_progress(output_name, in_progress); + if (ds->has_io_time) + submit_io_time(output_name, io_time, weighted_time); + } /* if (is_disk) */ + +#if HAVE_UDEV_H + /* release udev-based alternate name, if allocated */ + sfree(alt_name); +#endif + } /* while (fgets (buffer, sizeof (buffer), fh) != NULL) */ + + fclose(fh); /* #endif defined(KERNEL_LINUX) */ #elif HAVE_LIBKSTAT -# if HAVE_KSTAT_IO_T_WRITES && HAVE_KSTAT_IO_T_NWRITES && HAVE_KSTAT_IO_T_WTIME -# define KIO_ROCTETS reads -# define KIO_WOCTETS writes -# define KIO_ROPS nreads -# define KIO_WOPS nwrites -# define KIO_RTIME rtime -# define KIO_WTIME wtime -# elif HAVE_KSTAT_IO_T_NWRITTEN && HAVE_KSTAT_IO_T_WRITES && HAVE_KSTAT_IO_T_WTIME -# define KIO_ROCTETS nread -# define KIO_WOCTETS nwritten -# define KIO_ROPS reads -# define KIO_WOPS writes -# define KIO_RTIME rtime -# define KIO_WTIME wtime -# else -# error "kstat_io_t does not have the required members" -# endif - static kstat_io_t kio; - - if (kc == NULL) - return (-1); - - for (int i = 0; i < numdisk; i++) - { - if (kstat_read (kc, ksp[i], &kio) == -1) - continue; - - if (strncmp (ksp[i]->ks_class, "disk", 4) == 0) - { - if (ignorelist_match (ignorelist, ksp[i]->ks_name) != 0) - continue; - - disk_submit (ksp[i]->ks_name, "disk_octets", - kio.KIO_ROCTETS, kio.KIO_WOCTETS); - disk_submit (ksp[i]->ks_name, "disk_ops", - kio.KIO_ROPS, kio.KIO_WOPS); - /* FIXME: Convert this to microseconds if necessary */ - disk_submit (ksp[i]->ks_name, "disk_time", - kio.KIO_RTIME, kio.KIO_WTIME); - } - else if (strncmp (ksp[i]->ks_class, "partition", 9) == 0) - { - if (ignorelist_match (ignorelist, ksp[i]->ks_name) != 0) - continue; - - disk_submit (ksp[i]->ks_name, "disk_octets", - kio.KIO_ROCTETS, kio.KIO_WOCTETS); - disk_submit (ksp[i]->ks_name, "disk_ops", - kio.KIO_ROPS, kio.KIO_WOPS); - } - } +#if HAVE_KSTAT_IO_T_WRITES && HAVE_KSTAT_IO_T_NWRITES && HAVE_KSTAT_IO_T_WTIME +#define KIO_ROCTETS reads +#define KIO_WOCTETS writes +#define KIO_ROPS nreads +#define KIO_WOPS nwrites +#define KIO_RTIME rtime +#define KIO_WTIME wtime +#elif HAVE_KSTAT_IO_T_NWRITTEN && HAVE_KSTAT_IO_T_WRITES && \ + HAVE_KSTAT_IO_T_WTIME +#define KIO_ROCTETS nread +#define KIO_WOCTETS nwritten +#define KIO_ROPS reads +#define KIO_WOPS writes +#define KIO_RTIME rtime +#define KIO_WTIME wtime +#else +#error "kstat_io_t does not have the required members" +#endif + static kstat_io_t kio; + + if (kc == NULL) + return (-1); + + for (int i = 0; i < numdisk; i++) { + if (kstat_read(kc, ksp[i], &kio) == -1) + continue; + + if (strncmp(ksp[i]->ks_class, "disk", 4) == 0) { + if (ignorelist_match(ignorelist, ksp[i]->ks_name) != 0) + continue; + + disk_submit(ksp[i]->ks_name, "disk_octets", kio.KIO_ROCTETS, + kio.KIO_WOCTETS); + disk_submit(ksp[i]->ks_name, "disk_ops", kio.KIO_ROPS, kio.KIO_WOPS); + /* FIXME: Convert this to microseconds if necessary */ + disk_submit(ksp[i]->ks_name, "disk_time", kio.KIO_RTIME, kio.KIO_WTIME); + } else if (strncmp(ksp[i]->ks_class, "partition", 9) == 0) { + if (ignorelist_match(ignorelist, ksp[i]->ks_name) != 0) + continue; + + disk_submit(ksp[i]->ks_name, "disk_octets", kio.KIO_ROCTETS, + kio.KIO_WOCTETS); + disk_submit(ksp[i]->ks_name, "disk_ops", kio.KIO_ROPS, kio.KIO_WOPS); + } + } /* #endif defined(HAVE_LIBKSTAT) */ #elif defined(HAVE_LIBSTATGRAB) - sg_disk_io_stats *ds; -# if HAVE_LIBSTATGRAB_0_90 - size_t disks; -# else - int disks; + sg_disk_io_stats *ds; +#if HAVE_LIBSTATGRAB_0_90 + size_t disks; +#else + int disks; #endif - char name[DATA_MAX_NAME_LEN]; + char name[DATA_MAX_NAME_LEN]; - if ((ds = sg_get_disk_io_stats(&disks)) == NULL) - return (0); + if ((ds = sg_get_disk_io_stats(&disks)) == NULL) + return (0); - for (int counter = 0; counter < disks; counter++) { - strncpy(name, ds->disk_name, sizeof(name)); - name[sizeof(name)-1] = '\0'; /* strncpy doesn't terminate longer strings */ + for (int counter = 0; counter < disks; counter++) { + strncpy(name, ds->disk_name, sizeof(name)); + name[sizeof(name) - 1] = + '\0'; /* strncpy doesn't terminate longer strings */ - if (ignorelist_match (ignorelist, name) != 0) { - ds++; - continue; - } + if (ignorelist_match(ignorelist, name) != 0) { + ds++; + continue; + } - disk_submit (name, "disk_octets", ds->read_bytes, ds->write_bytes); - ds++; - } + disk_submit(name, "disk_octets", ds->read_bytes, ds->write_bytes); + ds++; + } /* #endif defined(HAVE_LIBSTATGRAB) */ #elif defined(HAVE_PERFSTAT) - derive_t read_sectors; - derive_t write_sectors; - derive_t read_time; - derive_t write_time; - derive_t read_ops; - derive_t write_ops; - perfstat_id_t firstpath; - int rnumdisk; - - if ((numdisk = perfstat_disk(NULL, NULL, sizeof(perfstat_disk_t), 0)) < 0) - { - char errbuf[1024]; - WARNING ("disk plugin: perfstat_disk: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - return (-1); - } - - if (numdisk != pnumdisk || stat_disk==NULL) { - if (stat_disk!=NULL) - free(stat_disk); - stat_disk = (perfstat_disk_t *)calloc(numdisk, sizeof(perfstat_disk_t)); - } - pnumdisk = numdisk; - - firstpath.name[0]='\0'; - if ((rnumdisk = perfstat_disk(&firstpath, stat_disk, sizeof(perfstat_disk_t), numdisk)) < 0) - { - char errbuf[1024]; - WARNING ("disk plugin: perfstat_disk : %s", - sstrerror (errno, errbuf, sizeof (errbuf))); - return (-1); - } - - for (int i = 0; i < rnumdisk; i++) - { - if (ignorelist_match (ignorelist, stat_disk[i].name) != 0) - continue; - - read_sectors = stat_disk[i].rblks*stat_disk[i].bsize; - write_sectors = stat_disk[i].wblks*stat_disk[i].bsize; - disk_submit (stat_disk[i].name, "disk_octets", read_sectors, write_sectors); - - read_ops = stat_disk[i].xrate; - write_ops = stat_disk[i].xfers - stat_disk[i].xrate; - disk_submit (stat_disk[i].name, "disk_ops", read_ops, write_ops); - - read_time = stat_disk[i].rserv; - read_time *= ((double)(_system_configuration.Xint)/(double)(_system_configuration.Xfrac)) / 1000000.0; - write_time = stat_disk[i].wserv; - write_time *= ((double)(_system_configuration.Xint)/(double)(_system_configuration.Xfrac)) / 1000000.0; - disk_submit (stat_disk[i].name, "disk_time", read_time, write_time); - } + derive_t read_sectors; + derive_t write_sectors; + derive_t read_time; + derive_t write_time; + derive_t read_ops; + derive_t write_ops; + perfstat_id_t firstpath; + int rnumdisk; + + if ((numdisk = perfstat_disk(NULL, NULL, sizeof(perfstat_disk_t), 0)) < 0) { + char errbuf[1024]; + WARNING("disk plugin: perfstat_disk: %s", + sstrerror(errno, errbuf, sizeof(errbuf))); + return (-1); + } + + if (numdisk != pnumdisk || stat_disk == NULL) { + if (stat_disk != NULL) + free(stat_disk); + stat_disk = (perfstat_disk_t *)calloc(numdisk, sizeof(perfstat_disk_t)); + } + pnumdisk = numdisk; + + firstpath.name[0] = '\0'; + if ((rnumdisk = perfstat_disk(&firstpath, stat_disk, sizeof(perfstat_disk_t), + numdisk)) < 0) { + char errbuf[1024]; + WARNING("disk plugin: perfstat_disk : %s", + sstrerror(errno, errbuf, sizeof(errbuf))); + return (-1); + } + + for (int i = 0; i < rnumdisk; i++) { + if (ignorelist_match(ignorelist, stat_disk[i].name) != 0) + continue; + + read_sectors = stat_disk[i].rblks * stat_disk[i].bsize; + write_sectors = stat_disk[i].wblks * stat_disk[i].bsize; + disk_submit(stat_disk[i].name, "disk_octets", read_sectors, write_sectors); + + read_ops = stat_disk[i].xrate; + write_ops = stat_disk[i].xfers - stat_disk[i].xrate; + disk_submit(stat_disk[i].name, "disk_ops", read_ops, write_ops); + + read_time = stat_disk[i].rserv; + read_time *= ((double)(_system_configuration.Xint) / + (double)(_system_configuration.Xfrac)) / + 1000000.0; + write_time = stat_disk[i].wserv; + write_time *= ((double)(_system_configuration.Xint) / + (double)(_system_configuration.Xfrac)) / + 1000000.0; + disk_submit(stat_disk[i].name, "disk_time", read_time, write_time); + } #endif /* defined(HAVE_PERFSTAT) */ - return (0); + return (0); } /* int disk_read */ -void module_register (void) -{ - plugin_register_config ("disk", disk_config, - config_keys, config_keys_num); - plugin_register_init ("disk", disk_init); - plugin_register_shutdown ("disk", disk_shutdown); - plugin_register_read ("disk", disk_read); +void module_register(void) { + plugin_register_config("disk", disk_config, config_keys, config_keys_num); + plugin_register_init("disk", disk_init); + plugin_register_shutdown("disk", disk_shutdown); + plugin_register_read("disk", disk_read); } /* void module_register */