X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=cc988625b32178a005222befd9dccae0898270e5;hb=0f877a368c1c339386add57c573094855457eefe;hp=8b4c788562ba4c759bb897102836283e6fab409e;hpb=6bbdc6d1d601380661cf48c505bc6e71402f2eeb;p=collectd.git diff --git a/src/zfs_arc.c b/src/zfs_arc.c index 8b4c7885..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) @@ -52,12 +54,40 @@ static void za_submit_gauge (const char* type, const char* type_instance, gauge_ za_submit (type, type_instance, &vv, 1); } -static void za_submit_derive (const char* type, const char* type_instance, derive_t dv) +static int za_read_derive (kstat_t *ksp, const char *kstat_value, + const char *type, const char *type_instance) { - value_t vv; + 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); +} - vv.derive = dv; - za_submit (type, type_instance, &vv, 1); +static int za_read_gauge (kstat_t *ksp, const char *kstat_value, + const char *type, const char *type_instance) +{ + 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_ratio (const char* type_instance, gauge_t hits, gauge_t misses) @@ -75,50 +105,11 @@ static void za_submit_ratio (const char* type_instance, gauge_t hits, gauge_t mi za_submit_gauge ("cache_ratio", type_instance, ratio); } -static void za_submit_mutex_counts (derive_t mutex_miss) -{ - value_t values[1]; - - values[0].counter = mutex_miss; - - za_submit ("mutex", "counts", values, STATIC_ARRAY_SIZE(values)); -} - -static void za_submit_deleted_counts (derive_t deleted) -{ - value_t values[1]; - - values[0].counter = deleted; - - za_submit ("deleted", "counts", values, STATIC_ARRAY_SIZE(values)); -} - -static void za_submit_hash_counts (derive_t hash_collisions) -{ - value_t values[1]; - - values[0].counter = hash_collisions; - - za_submit ("hash", "counts", values, STATIC_ARRAY_SIZE(values)); -} - static int za_read (void) { - gauge_t arc_size, l2_size; - derive_t demand_data_hits, - demand_metadata_hits, - prefetch_data_hits, - prefetch_metadata_hits, - demand_data_misses, - demand_metadata_misses, - prefetch_data_misses, - prefetch_metadata_misses; gauge_t arc_hits, arc_misses, l2_hits, l2_misses; value_t l2_io[2]; - derive_t mutex_miss; - derive_t deleted; - derive_t evict_l2_cached, evict_l2_eligible, evict_l2_ineligible; - derive_t hash_collisions; + kstat_t *ksp = NULL; get_kstat (&ksp, "zfs", 0, "arcstats"); if (ksp == NULL) @@ -128,46 +119,34 @@ static int za_read (void) } /* Sizes */ - arc_size = get_kstat_value(ksp, "size"); - l2_size = get_kstat_value(ksp, "l2_size"); - - za_submit_gauge ("cache_size", "arc", arc_size); - za_submit_gauge ("cache_size", "L2", l2_size); - - mutex_miss = get_kstat_value(ksp, "mutex_miss"); - - deleted = get_kstat_value(ksp, "deleted"); - - evict_l2_cached = get_kstat_value(ksp, "evict_l2_cached"); - evict_l2_eligible = get_kstat_value(ksp, "evict_l2_eligible"); - evict_l2_ineligible = get_kstat_value(ksp, "evict_l2_ineligible"); + 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", ""); - za_submit_derive ("cache_eviction", "cached", evict_l2_cached); - za_submit_derive ("cache_eviction", "eligible", evict_l2_eligible); - za_submit_derive ("cache_eviction", "ineligible", evict_l2_ineligible); - - hash_collisions = get_kstat_value(ksp, "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 */ - 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"); - - za_submit_derive ("cache_result", "demand_data-hit", demand_data_hits); - za_submit_derive ("cache_result", "demand_metadata-hit", demand_metadata_hits); - za_submit_derive ("cache_result", "prefetch_data-hit", prefetch_data_hits); - za_submit_derive ("cache_result", "prefetch_metadata-hit", prefetch_metadata_hits); - - za_submit_derive ("cache_result", "demand_data-miss", demand_data_misses); - za_submit_derive ("cache_result", "demand_metadata-miss", demand_metadata_misses); - za_submit_derive ("cache_result", "prefetch_data-miss", prefetch_data_misses); - za_submit_derive ("cache_result", "prefetch_metadata-miss", prefetch_metadata_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"); @@ -184,19 +163,11 @@ static int za_read (void) za_submit ("io_octets", "L2", l2_io, /* num values = */ 2); - za_submit_mutex_counts (mutex_miss); - - za_submit_deleted_counts (deleted); - - za_submit_hash_counts (deleted); - 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) {