X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=3a54ad8d57d92c97a6ef9b2050c8b68e02fef682;hb=51612a1b2f96f6e360f874f6da0b20eac94f48b3;hp=8341be0c306317aa21dac615a1c16f3b66611962;hpb=59c7ee1cafaf53814838794908dd84f8101334c7;p=collectd.git diff --git a/src/zfs_arc.c b/src/zfs_arc.c index 8341be0c..3a54ad8d 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -1,6 +1,8 @@ /** * collectd - src/zfs_arc.c * Copyright (C) 2009 Anthony Dewhurst + * Copyright (C) 2012 Aurelien Rougemont + * Copyright (C) 2013 Xin Li * * 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 +19,8 @@ * * Authors: * Anthony Dewhurst + * Aurelien Rougemont + * Xin Li **/ #include "collectd.h" @@ -26,9 +30,43 @@ /* * Global variables */ -static kstat_t *ksp; + +#if !defined(__FreeBSD__) extern kstat_ctl_t *kc; +static long long get_zfs_value(kstat_t *ksp, char *name) +{ + + return (get_kstat_value(ksp, name)); +} +#else +#include +#include + +const char zfs_arcstat[] = "kstat.zfs.misc.arcstats."; + +#if !defined(kstat_t) +typedef void kstat_t; +#endif + +static long long get_zfs_value(kstat_t *dummy __attribute__((unused)), + char const *name) +{ + char buffer[256]; + long long value; + size_t valuelen = sizeof(value); + int rv; + + ssnprintf (buffer, sizeof (buffer), "%s%s", zfs_arcstat, name); + rv = sysctlbyname (buffer, (void *) &value, &valuelen, + /* new value = */ NULL, /* new length = */ (size_t) 0); + if (rv == 0) + return (value); + + return (-1); +} +#endif + static void za_submit (const char* type, const char* type_instance, value_t* values, int values_len) { value_list_t vl = VALUE_LIST_INIT; @@ -52,12 +90,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_zfs_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_zfs_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) @@ -77,65 +143,68 @@ static void za_submit_ratio (const char* type_instance, gauge_t hits, gauge_t mi 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]; + kstat_t *ksp = NULL; +#if !defined(__FreeBSD__) get_kstat (&ksp, "zfs", 0, "arcstats"); if (ksp == NULL) { ERROR ("zfs_arc plugin: Cannot find zfs:0:arcstats kstat."); return (-1); } +#endif /* 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); + za_read_gauge (ksp, "size", "cache_size", "arc"); + + /* The "l2_size" value has disappeared from Solaris some time in + * early 2013, and has only reappeared recently in Solaris 11.2. + * Stop trying if we ever fail to read it, so we don't spam the log. + */ + static int l2_size_avail = 1; + if (l2_size_avail && za_read_gauge (ksp, "l2_size", "cache_size", "L2") != 0) + l2_size_avail = 0; + + /* 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 */ - 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"); - 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"); + arc_hits = (gauge_t) get_zfs_value(ksp, "hits"); + arc_misses = (gauge_t) get_zfs_value(ksp, "misses"); + l2_hits = (gauge_t) get_zfs_value(ksp, "l2_hits"); + l2_misses = (gauge_t) get_zfs_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"); + l2_io[0].derive = get_zfs_value(ksp, "l2_read_bytes"); + l2_io[1].derive = get_zfs_value(ksp, "l2_write_bytes"); za_submit ("io_octets", "L2", l2_io, /* num values = */ 2); @@ -144,14 +213,14 @@ static int za_read (void) static int za_init (void) /* {{{ */ { - ksp = NULL; - +#if !defined(__FreeBSD__) /* kstats chain already opened by update_kstat (using *kc), verify everything went fine. */ if (kc == NULL) { ERROR ("zfs_arc plugin: kstat chain control structure not available."); return (-1); } +#endif return (0); } /* }}} int za_init */