X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=cc988625b32178a005222befd9dccae0898270e5;hb=9f6f901889d4c9f594b5ae1fd0f449fcdd2d8fe3;hp=5f14e90981adda089fb2b94cd85b5094a4e451b2;hpb=071ba511ddd1245b1f56c28f1801ca37e9adfaa1;p=collectd.git diff --git a/src/zfs_arc.c b/src/zfs_arc.c index 5f14e909..cc988625 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -1,6 +1,7 @@ /** * collectd - src/zfs_arc.c * Copyright (C) 2009 Anthony Dewhurst + * Copyright (C) 2012 Aurelien Rougemont * * 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 @@ -17,6 +18,7 @@ * * Authors: * Anthony Dewhurst + * Aurelien Rougemont **/ #include "collectd.h" @@ -26,7 +28,7 @@ /* * Global variables */ -static kstat_t *ksp; + extern kstat_ctl_t *kc; static void za_submit (const char* type, const char* type_instance, value_t* values, int values_len) @@ -46,54 +48,68 @@ static void za_submit (const char* type, const char* type_instance, value_t* val static void za_submit_gauge (const char* type, const char* type_instance, gauge_t value) { - value_t values[1]; - - values[0].gauge = value; + value_t vv; - za_submit (type, type_instance, values, STATIC_ARRAY_SIZE(values)); + vv.gauge = value; + za_submit (type, type_instance, &vv, 1); } -static void za_submit_size (gauge_t size, gauge_t size_target, gauge_t limit_min, gauge_t limit_max) +static int za_read_derive (kstat_t *ksp, const char *kstat_value, + const char *type, const char *type_instance) { - value_t values[4]; - - values[0].gauge = size; - values[1].gauge = size_target; - values[2].gauge = limit_min; - values[3].gauge = limit_max; - - za_submit ("arc_size", "", values, STATIC_ARRAY_SIZE(values)); + long long tmp; + value_t v; + + tmp = get_kstat_value (ksp, (char *)kstat_value); + if (tmp == -1LL) + { + WARNING ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value); + return (-1); + } + + v.derive = (derive_t) tmp; + za_submit (type, type_instance, /* values = */ &v, /* values_num = */ 1); + return (0); } -static void za_submit_bytes (counter_t read, counter_t write) +static int za_read_gauge (kstat_t *ksp, const char *kstat_value, + const char *type, const char *type_instance) { - value_t values[2]; - - values[0].counter = read; - values[1].counter = write; - - za_submit ("arc_l2_bytes", "", values, STATIC_ARRAY_SIZE(values)); + long long tmp; + value_t v; + + tmp = get_kstat_value (ksp, (char *)kstat_value); + if (tmp == -1LL) + { + WARNING ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value); + return (-1); + } + + v.gauge = (gauge_t) tmp; + za_submit (type, type_instance, /* values = */ &v, /* values_num = */ 1); + return (0); } -static void za_submit_counts (char *type_instance, counter_t demand_data, counter_t demand_metadata, - counter_t prefetch_data, counter_t prefetch_metadata) +static void za_submit_ratio (const char* type_instance, gauge_t hits, gauge_t misses) { - value_t values[4]; + gauge_t ratio = NAN; + + if (!isfinite (hits) || (hits < 0.0)) + hits = 0.0; + if (!isfinite (misses) || (misses < 0.0)) + misses = 0.0; - values[0].counter = demand_data; - values[1].counter = demand_metadata; - values[2].counter = prefetch_data; - values[3].counter = prefetch_metadata; + if ((hits != 0.0) || (misses != 0.0)) + ratio = hits / (hits + misses); - za_submit ("arc_counts", type_instance, values, STATIC_ARRAY_SIZE(values)); + za_submit_gauge ("cache_ratio", type_instance, ratio); } static int za_read (void) { - gauge_t arcsize, targetsize, minlimit, maxlimit, hits, misses, l2_size, l2_hits, l2_misses; - counter_t demand_data_hits, demand_metadata_hits, prefetch_data_hits, prefetch_metadata_hits; - counter_t demand_data_misses, demand_metadata_misses, prefetch_data_misses, prefetch_metadata_misses; - counter_t l2_read_bytes, l2_write_bytes; + gauge_t arc_hits, arc_misses, l2_hits, l2_misses; + value_t l2_io[2]; + kstat_t *ksp = NULL; get_kstat (&ksp, "zfs", 0, "arcstats"); if (ksp == NULL) @@ -102,51 +118,56 @@ static int za_read (void) return (-1); } - arcsize = get_kstat_value(ksp, "size"); - targetsize = get_kstat_value(ksp, "c"); - minlimit = get_kstat_value(ksp, "c_min"); - maxlimit = get_kstat_value(ksp, "c_max"); - - demand_data_hits = get_kstat_value(ksp, "demand_data_hits"); - demand_metadata_hits = get_kstat_value(ksp, "demand_metadata_hits"); - prefetch_data_hits = get_kstat_value(ksp, "prefetch_data_hits"); - prefetch_metadata_hits = get_kstat_value(ksp, "prefetch_metadata_hits"); - - demand_data_misses = get_kstat_value(ksp, "demand_data_misses"); - demand_metadata_misses = get_kstat_value(ksp, "demand_metadata_misses"); - prefetch_data_misses = get_kstat_value(ksp, "prefetch_data_misses"); - prefetch_metadata_misses = get_kstat_value(ksp, "prefetch_metadata_misses"); - - hits = get_kstat_value(ksp, "hits"); - misses = get_kstat_value(ksp, "misses"); - - l2_size = get_kstat_value(ksp, "l2_size"); - l2_read_bytes = get_kstat_value(ksp, "l2_read_bytes"); - l2_write_bytes = get_kstat_value(ksp, "l2_write_bytes"); - l2_hits = get_kstat_value(ksp, "l2_hits"); - l2_misses = get_kstat_value(ksp, "l2_misses"); - - - za_submit_size (arcsize, targetsize, minlimit, maxlimit); - za_submit_gauge ("arc_l2_size", "", l2_size); - - za_submit_counts ("hits", demand_data_hits, demand_metadata_hits, - prefetch_data_hits, prefetch_metadata_hits); - za_submit_counts ("misses", demand_data_misses, demand_metadata_misses, - prefetch_data_misses, prefetch_metadata_misses); - - za_submit_gauge ("arc_ratio", "L1", hits / (hits + misses)); - za_submit_gauge ("arc_ratio", "L2", l2_hits / (l2_hits + l2_misses)); - - za_submit_bytes (l2_read_bytes, l2_write_bytes); + /* Sizes */ + za_read_gauge (ksp, "size", "cache_size", "arc"); + za_read_gauge (ksp, "l2_size", "cache_size", "L2"); + + /* Operations */ + za_read_derive (ksp, "deleted", "cache_operation", "deleted"); +#if __FreeBSD__ + za_read_derive (ksp, "allocated","cache_operation", "allocated"); + za_read_derive (ksp, "stolen", "cache_operation", "stolen"); +#endif + + /* Issue indicators */ + za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss"); + za_read_derive (ksp, "hash_collisions", "hash_collisions", ""); + + /* Evictions */ + za_read_derive (ksp, "evict_l2_cached", "cache_eviction", "cached"); + za_read_derive (ksp, "evict_l2_eligible", "cache_eviction", "eligible"); + za_read_derive (ksp, "evict_l2_ineligible", "cache_eviction", "ineligible"); + + /* Hits / misses */ + za_read_derive (ksp, "demand_data_hits", "cache_result", "demand_data-hit"); + za_read_derive (ksp, "demand_metadata_hits", "cache_result", "demand_metadata-hit"); + za_read_derive (ksp, "prefetch_data_hits", "cache_result", "prefetch_data-hit"); + za_read_derive (ksp, "prefetch_metadata_hits", "cache_result", "prefetch_metadata-hit"); + za_read_derive (ksp, "demand_data_misses", "cache_result", "demand_data-miss"); + za_read_derive (ksp, "demand_metadata_misses", "cache_result", "demand_metadata-miss"); + za_read_derive (ksp, "prefetch_data_misses", "cache_result", "prefetch_data-miss"); + za_read_derive (ksp, "prefetch_metadata_misses", "cache_result", "prefetch_metadata-miss"); + + /* Ratios */ + arc_hits = (gauge_t) get_kstat_value(ksp, "hits"); + arc_misses = (gauge_t) get_kstat_value(ksp, "misses"); + l2_hits = (gauge_t) get_kstat_value(ksp, "l2_hits"); + l2_misses = (gauge_t) get_kstat_value(ksp, "l2_misses"); + + za_submit_ratio ("arc", arc_hits, arc_misses); + za_submit_ratio ("L2", l2_hits, l2_misses); + + /* I/O */ + l2_io[0].derive = get_kstat_value(ksp, "l2_read_bytes"); + l2_io[1].derive = get_kstat_value(ksp, "l2_write_bytes"); + + za_submit ("io_octets", "L2", l2_io, /* num values = */ 2); return (0); -} +} /* int za_read */ static int za_init (void) /* {{{ */ { - ksp = NULL; - /* kstats chain already opened by update_kstat (using *kc), verify everything went fine. */ if (kc == NULL) {