X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=37a918b54bec75daa872ac1d40e1566af888d218;hb=edd9af8a874ebc9f2a7f02846807229a648917db;hp=65a50b4e0986b6fc92a123b1dedeaf2cf0484f2c;hpb=60451f81f174fc283345ade43d95857c56d17e88;p=collectd.git diff --git a/src/zfs_arc.c b/src/zfs_arc.c index 65a50b4e..37a918b5 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -3,6 +3,8 @@ * Copyright (C) 2009 Anthony Dewhurst * Copyright (C) 2012 Aurelien Rougemont * Copyright (C) 2013 Xin Li + * Copyright (C) 2014 Marc Fournier + * Copyright (C) 2014 Wilfried Goesgens * * 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 @@ -21,6 +23,8 @@ * Anthony Dewhurst * Aurelien Rougemont * Xin Li + * Marc Fournier + * Wilfried Goesgens **/ #include "collectd.h" @@ -31,7 +35,75 @@ * Global variables */ -#if !defined(__FreeBSD__) +#if defined(KERNEL_LINUX) +#include "utils_llist.h" +#define ZOL_ARCSTATS_FILE "/proc/spl/kstat/zfs/arcstats" + +typedef llist_t kstat_t; + +static int put_zfs_value (kstat_t *ksp, char const *k, value_t v) +{ + llentry_t *e; + char *k_copy; + value_t *v_copy; + + k_copy = strdup (k); + if (k_copy == NULL) + return ENOMEM; + + v_copy = malloc (sizeof (*v_copy)); + if (v_copy == NULL) + { + sfree (k_copy); + return ENOMEM; + } + *v_copy = v; + + e = llentry_create (k_copy, v_copy); + if (e == NULL) + { + sfree (v_copy); + sfree (k_copy); + return ENOMEM; + } + + llist_append (ksp, e); + return 0; +} + +static long long get_zfs_value(kstat_t *ksp, const char *key) +{ + llentry_t *e; + value_t *v; + + e = llist_search (ksp, key); + if (e == NULL) + { + ERROR ("zfs_arc plugin: `llist_search` failed for key: '%s'.", key); + return (-1); + } + + v = e->value; + return ((long long) v->derive); +} + +static void free_zfs_values (kstat_t *ksp) +{ + llentry_t *e; + + if (ksp == NULL) + return; + + for (e = llist_head (ksp); e != NULL; e = e->next) + { + sfree (e->key); + sfree (e->value); + } + + llist_destroy (ksp); +} + +#elif defined(KERNEL_SOLARIS) extern kstat_ctl_t *kc; static long long get_zfs_value(kstat_t *ksp, char *name) @@ -39,7 +111,7 @@ static long long get_zfs_value(kstat_t *ksp, char *name) return (get_kstat_value(ksp, name)); } -#else +#elif defined(KERNEL_FREEBSD) #include #include @@ -147,7 +219,47 @@ static int za_read (void) value_t l2_io[2]; kstat_t *ksp = NULL; -#if !defined(__FreeBSD__) +#if defined(KERNEL_LINUX) + FILE *fh; + char buffer[1024]; + + fh = fopen (ZOL_ARCSTATS_FILE, "r"); + if (fh == NULL) + { + char errbuf[1024]; + ERROR ("zfs_arc plugin: Opening \"%s\" failed: %s", ZOL_ARCSTATS_FILE, + sstrerror (errno, errbuf, sizeof (errbuf))); + return (-1); + } + + ksp = llist_create (); + if (ksp == NULL) + { + ERROR ("zfs_arc plugin: `llist_create' failed."); + fclose (fh); + return (-1); + } + + while (fgets (buffer, sizeof (buffer), fh) != NULL) + { + char *fields[3]; + value_t v; + int status; + + status = strsplit (buffer, fields, STATIC_ARRAY_SIZE (fields)); + if (status != 3) + continue; + + status = parse_value (fields[2], &v, DS_TYPE_DERIVE); + if (status != 0) + continue; + + put_zfs_value (ksp, fields[0], v); + } + + fclose (fh); + +#elif defined(KERNEL_SOLARIS) get_kstat (&ksp, "zfs", 0, "arcstats"); if (ksp == NULL) { @@ -157,7 +269,19 @@ static int za_read (void) #endif /* Sizes */ - za_read_gauge (ksp, "size", "cache_size", "arc"); + za_read_gauge (ksp, "anon_size", "cache_size", "anon_size"); + za_read_gauge (ksp, "c", "cache_size", "c"); + za_read_gauge (ksp, "c_max", "cache_size", "c_max"); + za_read_gauge (ksp, "c_min", "cache_size", "c_min"); + za_read_gauge (ksp, "hdr_size", "cache_size", "hdr_size"); + za_read_gauge (ksp, "metadata_size", "cache_size", "metadata_size"); + za_read_gauge (ksp, "mfu_ghost_size", "cache_size", "mfu_ghost_size"); + za_read_gauge (ksp, "mfu_size", "cache_size", "mfu_size"); + za_read_gauge (ksp, "mru_ghost_size", "cache_size", "mru_ghost_size"); + za_read_gauge (ksp, "mru_size", "cache_size", "mru_size"); + za_read_gauge (ksp, "other_size", "cache_size", "other_size"); + za_read_gauge (ksp, "p", "cache_size", "p"); + 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. @@ -169,9 +293,9 @@ static int za_read (void) /* Operations */ za_read_derive (ksp, "deleted", "cache_operation", "deleted"); -#if __FreeBSD__ +#if defined(KERNEL_FREEBSD) za_read_derive (ksp, "allocated","cache_operation", "allocated"); -#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501) +#if __FreeBSD_version < 1002501 /* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */ za_read_derive (ksp, "stolen", "cache_operation", "stolen"); #endif @@ -180,7 +304,8 @@ static int za_read (void) /* Issue indicators */ za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss"); za_read_derive (ksp, "hash_collisions", "hash_collisions", ""); - + za_read_derive (ksp, "memory_throttle_count", "memory_throttle_count", ""); + /* Evictions */ za_read_derive (ksp, "evict_l2_cached", "cache_eviction", "cached"); za_read_derive (ksp, "evict_l2_eligible", "cache_eviction", "eligible"); @@ -195,6 +320,11 @@ static int za_read (void) 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"); + za_read_derive (ksp, "mfu_hits", "cache_result", "mfu-hit"); + za_read_derive (ksp, "mfu_ghost_hits", "cache_result", "mfu_ghost-hit"); + za_read_derive (ksp, "mru_hits", "cache_result", "mru-hit"); + za_read_derive (ksp, "mru_ghost_hits", "cache_result", "mru_ghost-hit"); + za_read_derive (ksp, "prefetch_metadata_misses", "cache_result", "prefetch_metadata-miss"); /* Ratios */ arc_hits = (gauge_t) get_zfs_value(ksp, "hits"); @@ -211,12 +341,16 @@ static int za_read (void) za_submit ("io_octets", "L2", l2_io, /* num values = */ 2); +#if defined(KERNEL_LINUX) + free_zfs_values (ksp); +#endif + return (0); } /* int za_read */ static int za_init (void) /* {{{ */ { -#if !defined(__FreeBSD__) +#if defined(KERNEL_SOLARIS) /* kstats chain already opened by update_kstat (using *kc), verify everything went fine. */ if (kc == NULL) {