From: Florian Forster Date: Thu, 17 Dec 2015 12:32:29 +0000 (+0100) Subject: zfs_arc plugin: Rewrite Linux parsing logic. X-Git-Tag: collectd-5.6.0~486 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a91beef540bd6524d52929f9730ff659cdea8a6;p=collectd.git zfs_arc plugin: Rewrite Linux parsing logic. CID: 38028 --- diff --git a/src/zfs_arc.c b/src/zfs_arc.c index fa920280..1a7613c7 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -41,19 +41,66 @@ typedef llist_t kstat_t; -static long long get_zfs_value(kstat_t *zfs_stats __attribute__((unused)), - char *name) +static int put_zfs_value (kstat_t *ksp, char const *k, value_t v) { llentry_t *e; + char *k_copy; + value_t *v_copy; - e = llist_search (zfs_stats, name); + 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) { - ERROR ("zfs_arc plugin: `llist_search` failed for key: '%s'.", name); + sfree (v_copy); + sfree (k_copy); + return ENOMEM; + } + + llist_append (ksp, e); + return 0; +} + +static long long get_zfs_value(kstat_t *ksp, 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); } - return (*(long long int*)e->value); + 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(__FreeBSD__) // Solaris @@ -173,79 +220,45 @@ static int za_read (void) kstat_t *ksp = NULL; #if KERNEL_LINUX - long long int *llvalues = NULL; - char file_contents[1024 * 10]; - char *fields[3]; - int numfields; - ssize_t len; + 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); } - len = read_file_contents (ZOL_ARCSTATS_FILE, file_contents, sizeof(file_contents) - 1); - if (len > 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; - int i=0; - char *pnl = file_contents; - char *pnnl; - - file_contents[len] = '\0'; - - while (pnl != NULL) - { - pnl = strchr(pnl, '\n'); - i++; - if (pnl && (*pnl != '\0')) - pnl++; - } - - if (i > 0) - { - llentry_t *e; - llvalues = malloc(sizeof(long long int) * i); - if (llvalues == NULL) - { - ERROR ("zfs_arc plugin: `malloc' failed."); - llist_destroy (ksp); - return (-1); - } - int j = 0; - - pnl = file_contents; - while (pnl != NULL) - { - pnnl = strchr(pnl, '\n'); - if (pnnl != NULL) - *pnnl = '\0'; - - numfields = strsplit (pnl, fields, 4); - if (numfields == 3) - { - llvalues[j] = atoll (fields[2]); - - e = llentry_create (fields[0], &llvalues[j]); - if (e == NULL) - { - ERROR ("zfs_arc plugin: `llentry_create' failed."); - } - else - { - llist_append (ksp, e); - } - j++; - } - pnl = pnnl; - if (pnl != NULL) - pnl ++; - } - } + status = parse_value (fields[2], &v, DS_TYPE_DERIVE); + if (status != 0) + continue; + + put_zfs_value (ksp, fields[0], v); } + fclose (fh); + #elif !defined(__FreeBSD__) // Solaris get_kstat (&ksp, "zfs", 0, "arcstats"); if (ksp == NULL) @@ -311,14 +324,7 @@ static int za_read (void) za_submit ("io_octets", "L2", l2_io, /* num values = */ 2); #if defined(KERNEL_LINUX) - if (llvalues != NULL) - { - free(llvalues); - } - if (ksp != NULL) - { - llist_destroy (ksp); - } + free_zfs_values (ksp); #endif return (0);