From: Florian Forster Date: Mon, 29 Jan 2007 13:54:10 +0000 (+0100) Subject: disk plugin: Converted to the new plugin interface. X-Git-Tag: collectd-4.0.0~211^2~3 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c4ad0795c3dc5f46f98dfd9c8a06680e383344d6;p=collectd.git disk plugin: Converted to the new plugin interface. --- diff --git a/src/disk.c b/src/disk.c index c809fdb6..3cb86e7e 100644 --- a/src/disk.c +++ b/src/disk.c @@ -1,11 +1,10 @@ /** * collectd - src/disk.c - * Copyright (C) 2005,2006 Florian octo Forster + * Copyright (C) 2005-2007 Florian octo Forster * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Free Software Foundation; only version 2 of the License is applicable. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,8 +24,6 @@ #include "plugin.h" #include "utils_debug.h" -#define MODULE_NAME "disk" - #if HAVE_MACH_MACH_TYPES_H # include #endif @@ -61,34 +58,53 @@ # define DISK_HAVE_READ 0 #endif -static char *disk_filename_template = "disk-%s.rrd"; -static char *part_filename_template = "partition-%s.rrd"; +/* 2^34 = 17179869184 = ~17.2GByte/s */ +static data_source_t octets_dsrc[2] = +{ + {"read", DS_TYPE_COUNTER, 0, 17179869183.0}, + {"write", DS_TYPE_COUNTER, 0, 17179869183.0} +}; + +static data_set_t octets_ds = +{ + "disk_octets", 2, octets_dsrc +}; + +static data_source_t operations_dsrc[2] = +{ + {"read", DS_TYPE_COUNTER, 0, 4294967295.0}, + {"write", DS_TYPE_COUNTER, 0, 4294967295.0} +}; -/* 104857600 == 100 MB */ -static char *disk_ds_def[] = +static data_set_t operations_ds = { - "DS:rcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", - "DS:rmerged:COUNTER:"COLLECTD_HEARTBEAT":0:U", - "DS:rbytes:COUNTER:"COLLECTD_HEARTBEAT":0:104857600", - "DS:rtime:COUNTER:"COLLECTD_HEARTBEAT":0:U", - "DS:wcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", - "DS:wmerged:COUNTER:"COLLECTD_HEARTBEAT":0:U", - "DS:wbytes:COUNTER:"COLLECTD_HEARTBEAT":0:104857600", - "DS:wtime:COUNTER:"COLLECTD_HEARTBEAT":0:U", - NULL + "disk_ops", 2, operations_dsrc }; -static int disk_ds_num = 8; -static char *part_ds_def[] = +static data_source_t merged_dsrc[2] = { - "DS:rcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", - "DS:rbytes:COUNTER:"COLLECTD_HEARTBEAT":0:104857600", - "DS:wcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", - "DS:wbytes:COUNTER:"COLLECTD_HEARTBEAT":0:104857600", - NULL + {"read", DS_TYPE_COUNTER, 0, 4294967295.0}, + {"write", DS_TYPE_COUNTER, 0, 4294967295.0} }; -static int part_ds_num = 4; +static data_set_t merged_ds = +{ + "disk_merged", 2, merged_dsrc +}; + +/* max is 1000000us per second. */ +static data_source_t time_dsrc[2] = +{ + {"read", DS_TYPE_COUNTER, 0, 1000000.0}, + {"write", DS_TYPE_COUNTER, 0, 1000000.0} +}; + +static data_set_t time_ds = +{ + "disk_time", 2, time_dsrc +}; + +#if DISK_HAVE_READ #if HAVE_IOKIT_IOKITLIB_H static mach_port_t io_master_port = MACH_PORT_NULL; /* #endif HAVE_IOKIT_IOKITLIB_H */ @@ -101,11 +117,11 @@ typedef struct diskstats /* This overflows in roughly 1361 year */ unsigned int poll_count; - unsigned long long read_sectors; - unsigned long long write_sectors; + counter_t read_sectors; + counter_t write_sectors; - unsigned long long read_bytes; - unsigned long long write_bytes; + counter_t read_bytes; + counter_t write_bytes; struct diskstats *next; } diskstats_t; @@ -121,7 +137,7 @@ static kstat_t *ksp[MAX_NUMDISK]; static int numdisk = 0; #endif /* HAVE_LIBKSTAT */ -static void disk_init (void) +static int disk_init (void) { #if HAVE_IOKIT_IOKITLIB_H kern_return_t status; @@ -139,7 +155,7 @@ static void disk_init (void) syslog (LOG_ERR, "IOMasterPort failed: %s", mach_error_string (status)); io_master_port = MACH_PORT_NULL; - return; + return (-1); } /* #endif HAVE_IOKIT_IOKITLIB_H */ @@ -163,7 +179,7 @@ static void disk_init (void) numdisk = 0; if (kc == NULL) - return; + return (-1); for (numdisk = 0, ksp_chain = kc->kc_chain; (numdisk < MAX_NUMDISK) && (ksp_chain != NULL); @@ -178,83 +194,29 @@ static void disk_init (void) } #endif /* HAVE_LIBKSTAT */ - return; -} + return (0); +} /* int disk_init */ -static void disk_write (char *host, char *inst, char *val) +static void disk_submit (const char *plugin_instance, + const char *type, + counter_t read, counter_t write) { - char file[512]; - int status; + value_t values[2]; + value_list_t vl = VALUE_LIST_INIT; - status = snprintf (file, 512, disk_filename_template, inst); - if (status < 1) - return; - else if (status >= 512) - return; + values[0].counter = read; + values[1].counter = write; - rrd_update_file (host, file, val, disk_ds_def, disk_ds_num); -} + vl.values = values; + vl.values_len = 2; + vl.time = time (NULL); + strcpy (vl.host, hostname); + strcpy (vl.plugin, "disk"); + strncpy (vl.plugin_instance, plugin_instance, + sizeof (vl.plugin_instance)); -static void partition_write (char *host, char *inst, char *val) -{ - char file[512]; - int status; - - status = snprintf (file, 512, part_filename_template, inst); - if (status < 1) - return; - else if (status >= 512) - return; - - rrd_update_file (host, file, val, part_ds_def, part_ds_num); -} - -#if DISK_HAVE_READ -#define BUFSIZE 512 -static void disk_submit (char *disk_name, - unsigned long long read_count, - unsigned long long read_merged, - unsigned long long read_bytes, - unsigned long long read_time, - unsigned long long write_count, - unsigned long long write_merged, - unsigned long long write_bytes, - unsigned long long write_time) -{ - char buf[BUFSIZE]; - - if (snprintf (buf, BUFSIZE, "%u:%llu:%llu:%llu:%llu:%llu:%llu:%llu:%llu", - (unsigned int) curtime, - read_count, read_merged, read_bytes, read_time, - write_count, write_merged, write_bytes, - write_time) >= BUFSIZE) - return; - - DBG ("disk_name = %s; buf = %s;", - disk_name, buf); - - plugin_submit (MODULE_NAME, disk_name, buf); -} - -#if KERNEL_LINUX || HAVE_LIBKSTAT -static void partition_submit (char *part_name, - unsigned long long read_count, - unsigned long long read_bytes, - unsigned long long write_count, - unsigned long long write_bytes) -{ - char buf[BUFSIZE]; - - if (snprintf (buf, BUFSIZE, "%u:%llu:%llu:%llu:%llu", - (unsigned int) curtime, - read_count, read_bytes, write_count, - write_bytes) >= BUFSIZE) - return; - - plugin_submit ("partition", part_name, buf); -} -#endif /* KERNEL_LINUX || HAVE_LIBKSTAT */ -#undef BUFSIZE + plugin_dispatch_values (type, &vl); +} /* void disk_submit */ #if HAVE_IOKIT_IOKITLIB_H static signed long long dict_get_value (CFDictionaryRef dict, const char *key) @@ -293,7 +255,7 @@ static signed long long dict_get_value (CFDictionaryRef dict, const char *key) } #endif /* HAVE_IOKIT_IOKITLIB_H */ -static void disk_read (void) +static int disk_read (void) { #if HAVE_IOKIT_IOKITLIB_H io_registry_entry_t disk; @@ -324,7 +286,7 @@ static void disk_read (void) { plugin_complain (LOG_ERR, &complain_obj, "disk plugin: " "IOServiceGetMatchingServices failed."); - return; + return (-1); } else if (complain_obj.interval != 0) { @@ -395,6 +357,7 @@ static void disk_read (void) continue; } + /* kIOBSDNameKey */ disk_major = (int) dict_get_value (child_dict, kIOBSDMajorKey); disk_minor = (int) dict_get_value (child_dict, @@ -409,6 +372,11 @@ static void disk_read (void) kIOBlockStorageDriverStatisticsWritesKey); write_byt = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsBytesWrittenKey); + /* This property describes the number of nanoseconds spent + * performing writes since the block storage driver was + * instantiated. It is one of the statistic entries listed + * under the top-level kIOBlockStorageDriverStatisticsKey + * property table. It has an OSNumber value. */ write_tme = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsTotalWriteTimeKey); @@ -423,15 +391,14 @@ static void disk_read (void) } DBG ("disk_name = %s", disk_name); - if ((read_ops != -1LL) - || (read_byt != -1LL) - || (read_tme != -1LL) - || (write_ops != -1LL) - || (write_byt != -1LL) - || (write_tme != -1LL)) - disk_submit (disk_name, - read_ops, 0ULL, read_byt, read_tme, - write_ops, 0ULL, write_byt, write_tme); + 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); CFRelease (child_dict); IOObjectRelease (disk_child); @@ -444,7 +411,6 @@ static void disk_read (void) #elif KERNEL_LINUX FILE *fh; char buffer[1024]; - char disk_name[128]; char *fields[32]; int numfields; @@ -453,17 +419,17 @@ static void disk_read (void) int major = 0; int minor = 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; + counter_t read_sectors = 0; + counter_t write_sectors = 0; + + counter_t read_count = 0; + counter_t read_merged = 0; + counter_t read_bytes = 0; + counter_t read_time = 0; + counter_t write_count = 0; + counter_t write_merged = 0; + counter_t write_bytes = 0; + counter_t write_time = 0; int is_disk = 0; diskstats_t *ds, *pre_ds; @@ -474,18 +440,23 @@ static void disk_read (void) { if ((fh = fopen ("/proc/partitions", "r")) == NULL) { - plugin_complain (LOG_ERR, &complain_obj, "disk plugin: Failed to open /proc/{diskstats,partitions}."); - return; + plugin_complain (LOG_ERR, &complain_obj, + "disk plugin: Failed to open /proc/" + "{diskstats,partitions}."); + return (-1); } /* Kernel is 2.4.* */ fieldshift = 1; } - plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: Succeeded to open /proc/{diskstats,partitions}."); + plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: " + "Succeeded to open /proc/{diskstats,partitions}."); - while (fgets (buffer, 1024, fh) != NULL) + while (fgets (buffer, sizeof (buffer), fh) != NULL) { + char *disk_name; + numfields = strsplit (buffer, fields, 32); if ((numfields != (14 + fieldshift)) && (numfields != 7)) @@ -494,9 +465,7 @@ static void disk_read (void) major = atoll (fields[0]); minor = atoll (fields[1]); - if (snprintf (disk_name, 128, "%i-%i", major, minor) < 1) - continue; - disk_name[127] = '\0'; + disk_name = fields[2]; for (ds = disklist, pre_ds = disklist; ds != NULL; pre_ds = ds, ds = ds->next) if (strcmp (disk_name, ds->name) == 0) @@ -582,12 +551,21 @@ static void disk_read (void) continue; } + if ((read_bytes != -1LL) || (write_bytes != -1LL)) + disk_submit (disk_name, "disk_octets", read_bytes, write_bytes); + if ((read_count != -1LL) || (write_count != -1LL)) + disk_submit (disk_name, "disk_ops", read_count, write_count); if (is_disk) - disk_submit (disk_name, read_count, read_merged, read_bytes, read_time, - write_count, write_merged, write_bytes, write_time); - else - partition_submit (disk_name, read_count, read_bytes, write_count, write_bytes); - } + { + if ((read_merged != -1LL) || (write_merged != -1LL)) + disk_submit (disk_name, "disk_merged", + read_merged, write_merged); + if ((read_time != -1LL) || (write_time != -1LL)) + disk_submit (disk_name, "disk_time", + read_time * 1000, + write_time * 1000); + } + } /* while (fgets (buffer, sizeof (buffer), fh) != NULL) */ fclose (fh); /* #endif defined(KERNEL_LINUX) */ @@ -597,7 +575,7 @@ static void disk_read (void) int i; if (kc == NULL) - return; + return (-1); for (i = 0; i < numdisk; i++) { @@ -605,24 +583,33 @@ static void disk_read (void) continue; if (strncmp (ksp[i]->ks_class, "disk", 4) == 0) - disk_submit (ksp[i]->ks_name, - kio.reads, 0LL, kio.nread, kio.rtime, - kio.writes, 0LL, kio.nwritten, kio.wtime); + { + disk_submit (ksp[i]->ks_name, "disk_octets", kio.reads, kio.writes); + disk_submit (ksp[i]->ks_name, "disk_ops", kio.nreads, kio.nwrites); + /* FIXME: Convert this to microseconds if necessary */ + disk_submit (ksp[i]->ks_name, "disk_time", kio.rtime, kio.wtime); + } else if (strncmp (ksp[i]->ks_class, "partition", 9) == 0) - partition_submit (ksp[i]->ks_name, - kio.reads, kio.nread, - kio.writes,kio.nwritten); + { + disk_submit (ksp[i]->ks_name, "disk_octets", kio.reads, kio.writes); + disk_submit (ksp[i]->ks_name, "disk_ops", kio.nreads, kio.nwrites); + } } #endif /* defined(HAVE_LIBKSTAT) */ -} /* static void disk_read (void) */ -#else -# define disk_read NULL + + return (0); +} /* int disk_read */ #endif /* DISK_HAVE_READ */ void module_register (void) { - plugin_register ("partition", NULL, NULL, partition_write); - plugin_register (MODULE_NAME, disk_init, disk_read, disk_write); -} + plugin_register_data_set (&octets_ds); + plugin_register_data_set (&operations_ds); + plugin_register_data_set (&merged_ds); + plugin_register_data_set (&time_ds); -#undef MODULE_NAME +#if DISK_HAVE_READ + plugin_register_init ("disk", disk_init); + plugin_register_read ("disk", disk_read); +#endif /* DISK_HAVE_READ */ +}