/* This overflows in roughly 1361 year */
unsigned int poll_count;
- unsigned int read_sectors;
- unsigned int write_sectors;
+ unsigned long long read_sectors;
+ unsigned long long write_sectors;
unsigned long long read_bytes;
unsigned long long write_bytes;
} diskstats_t;
static diskstats_t *disklist;
+static int min_poll_count;
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKSTAT
/* #endif HAVE_IOKIT_IOKITLIB_H */
#elif KERNEL_LINUX
- /* No init needed */
+ int step;
+ int heartbeat;
+
+ step = atoi (COLLECTD_STEP);
+ heartbeat = atoi (COLLECTD_HEARTBEAT);
+
+ assert (step > 0);
+ assert (heartbeat >= step);
+
+ min_poll_count = 1 + (heartbeat / step);
+ DBG ("min_poll_count = %i;", min_poll_count);
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKSTAT
write_time) >= BUFSIZE)
return;
+ DBG ("disk_name = %s; buf = %s;",
+ disk_name, buf);
+
plugin_submit (MODULE_NAME, disk_name, buf);
}
CFNumberRef val_obj;
CFStringRef key_obj;
- CFStringRef CFStringCreateWithCString (
- CFAllocatorRef alloc,
- const char *cStr,
- CFStringEncoding encoding
- );
-
/* `key_obj' needs to be released. */
key_obj = CFStringCreateWithCString (kCFAllocatorDefault, key,
kCFStringEncodingASCII);
if (key_obj == NULL)
+ {
+ DBG ("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)
+ {
+ DBG ("CFDictionaryGetValue (%s) failed.", key);
return (-1LL);
+ }
- if (CFNumberGetValue (val_obj, kCFNumberSInt64Type, &val_int)
- != kIOReturnSuccess)
+ if (!CFNumberGetValue (val_obj, kCFNumberSInt64Type, &val_int))
+ {
+ DBG ("CFNumberGetValue (%s) failed.", key);
return (-1LL);
+ }
return (val_int);
}
CFDictionaryRef props_dict;
CFDictionaryRef stats_dict;
CFDictionaryRef child_dict;
+ kern_return_t status;
signed long long read_ops;
signed long long read_byt;
int disk_minor;
char disk_name[64];
+ static complain_t complain_obj;
+
/* Get the list of all disk objects. */
if (IOServiceGetMatchingServices (io_master_port,
IOServiceMatching (kIOBlockStorageDriverClass),
&disk_list) != kIOReturnSuccess)
{
- syslog (LOG_ERR, "disk-plugin: IOServiceGetMatchingServices failed.");
+ plugin_complain (LOG_ERR, &complain_obj, "disk plugin: "
+ "IOServiceGetMatchingServices failed.");
return;
}
+ else if (complain_obj.interval != 0)
+ {
+ plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: "
+ "IOServiceGetMatchingServices succeeded.");
+ }
while ((disk = IOIteratorNext (disk_list)) != 0)
{
stats_dict = NULL;
child_dict = NULL;
+ /* `disk_child' must be released */
+ if ((status = IORegistryEntryGetChildEntry (disk, kIOServicePlane, &disk_child))
+ != kIOReturnSuccess)
+ {
+ /* This fails for example for DVD/CD drives.. */
+ DBG ("IORegistryEntryGetChildEntry (disk) failed: 0x%08x", status);
+ IOObjectRelease (disk);
+ continue;
+ }
+
/* We create `props_dict' => we need to release it later */
if (IORegistryEntryCreateCFProperties (disk,
(CFMutableDictionaryRef *) &props_dict,
!= kIOReturnSuccess)
{
syslog (LOG_ERR, "disk-plugin: IORegistryEntryCreateCFProperties failed.");
+ IOObjectRelease (disk_child);
IOObjectRelease (disk);
continue;
}
if (props_dict == NULL)
{
DBG ("IORegistryEntryCreateCFProperties (disk) failed.");
+ IOObjectRelease (disk_child);
IOObjectRelease (disk);
continue;
}
DBG ("CFDictionaryGetValue (%s) failed.",
kIOBlockStorageDriverStatisticsKey);
CFRelease (props_dict);
- IOObjectRelease (disk);
- continue;
- }
-
- /* `disk_child' must be released */
- if (IORegistryEntryGetChildEntry (disk, kIOServicePlane, &disk_child)
- != kIOReturnSuccess)
- {
- DBG ("IORegistryEntryGetChildEntry (disk) failed.");
- CFRelease (props_dict);
+ IOObjectRelease (disk_child);
IOObjectRelease (disk);
continue;
}
IOObjectRelease (disk);
continue;
}
+ DBG ("disk_name = %s", disk_name);
if ((read_ops != -1LL)
|| (read_byt != -1LL)
int major = 0;
int minor = 0;
- unsigned int read_sectors;
- unsigned int write_sectors;
-
- unsigned long long read_count = 0;
- unsigned long long read_merged = 0;
- unsigned long long read_bytes = 0;
- unsigned long long read_time = 0;
- unsigned long long write_count = 0;
- unsigned long long write_merged = 0;
- unsigned long long write_bytes = 0;
- unsigned long long write_time = 0;
+ unsigned long long read_sectors = 0ULL;
+ unsigned long long write_sectors = 0ULL;
+
+ unsigned long long read_count = 0ULL;
+ unsigned long long read_merged = 0ULL;
+ unsigned long long read_bytes = 0ULL;
+ unsigned long long read_time = 0ULL;
+ unsigned long long write_count = 0ULL;
+ unsigned long long write_merged = 0ULL;
+ unsigned long long write_bytes = 0ULL;
+ unsigned long long write_time = 0ULL;
int is_disk = 0;
diskstats_t *ds, *pre_ds;
+ static complain_t complain_obj;
+
if ((fh = fopen ("/proc/diskstats", "r")) == NULL)
{
if ((fh = fopen ("/proc/partitions", "r")) == NULL)
+ {
+ plugin_complain (LOG_ERR, &complain_obj, "disk plugin: Failed to open /proc/{diskstats,partitions}.");
return;
+ }
/* Kernel is 2.4.* */
fieldshift = 1;
}
+ plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: Succeeded to open /proc/{diskstats,partitions}.");
+
while (fgets (buffer, 1024, fh) != NULL)
{
numfields = strsplit (buffer, fields, 32);
{
/* Kernel 2.6, Partition */
read_count = atoll (fields[3]);
- read_sectors = atoi (fields[4]);
+ read_sectors = atoll (fields[4]);
write_count = atoll (fields[5]);
- write_sectors = atoi (fields[6]);
+ write_sectors = atoll (fields[6]);
}
else if (numfields == (14 + fieldshift))
{
read_count = atoll (fields[3 + fieldshift]);
write_count = atoll (fields[7 + fieldshift]);
- read_sectors = atoi (fields[5 + fieldshift]);
- write_sectors = atoi (fields[9 + fieldshift]);
+ read_sectors = atoll (fields[5 + fieldshift]);
+ write_sectors = atoll (fields[9 + fieldshift]);
if ((fieldshift == 0) || (minor == 0))
{
}
else
{
+ DBG ("numfields = %i; => unknown file format.", numfields);
continue;
}
-
- if (read_sectors >= ds->read_sectors)
- ds->read_bytes += 512 * (read_sectors - ds->read_sectors);
+ /* If the counter wraps around, it's only 32 bits.. */
+ if (read_sectors < ds->read_sectors)
+ ds->read_bytes += 512 * ((0xFFFFFFFF - ds->read_sectors) + read_sectors);
else
- ds->read_bytes += 512 * ((UINT_MAX - ds->read_sectors) + read_sectors);
+ ds->read_bytes += 512 * (read_sectors - ds->read_sectors);
- if (write_sectors >= ds->write_sectors)
- ds->write_bytes += 512 * (write_sectors - ds->write_sectors);
+ if (write_sectors < ds->write_sectors)
+ ds->write_bytes += 512 * ((0xFFFFFFFF - ds->write_sectors) + write_sectors);
else
- ds->write_bytes += 512 * ((UINT_MAX - ds->write_sectors) + write_sectors);
+ ds->write_bytes += 512 * (write_sectors - ds->write_sectors);
ds->read_sectors = read_sectors;
ds->write_sectors = write_sectors;
/* Don't write to the RRDs if we've just started.. */
ds->poll_count++;
- if (ds->poll_count <= 6)
+ if (ds->poll_count <= min_poll_count)
+ {
+ DBG ("(ds->poll_count = %i) <= (min_poll_count = %i); => Not writing.",
+ ds->poll_count, min_poll_count);
continue;
+ }
if ((read_count == 0) && (write_count == 0))
+ {
+ DBG ("((read_count == 0) && (write_count == 0)); => Not writing.");
continue;
+ }
if (is_disk)
disk_submit (disk_name, read_count, read_merged, read_bytes, read_time,
projects / collectd.git / blobdiff