X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=1a7613c74a53cec15c7750395edd839220f2788c;hb=66005379ede9257c7a9c52759cec95591121ad5c;hp=3a54ad8d57d92c97a6ef9b2050c8b68e02fef682;hpb=9b43c4ca7442e7886c1fbe339ce57f297872269f;p=collectd.git

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index 3a54ad8d..1a7613c7 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 <dewhurst at gmail>
  *   Aurelien Rougemont <beorn at gandi.net>
  *   Xin Li <delphij at FreeBSD.org>
+ *   Marc Fournier <marc.fournier at camptocamp.com>
+ *   Wilfried Goesgens <dothebart at citadel.org>
  **/
 
 #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, 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(__FreeBSD__) // 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
+#else // FreeBSD
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
@@ -147,7 +219,47 @@ static int za_read (void)
 	value_t  l2_io[2];
 	kstat_t	 *ksp	= NULL;
 
-#if !defined(__FreeBSD__)
+#if 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(__FreeBSD__) // Solaris
 	get_kstat (&ksp, "zfs", 0, "arcstats");
 	if (ksp == NULL)
 	{
@@ -158,6 +270,9 @@ static int za_read (void)
 
 	/* Sizes */
 	za_read_gauge (ksp, "size",    "cache_size", "arc");
+	za_read_gauge (ksp, "c",    "cache_size", "c");
+	za_read_gauge (ksp, "c_min",    "cache_size", "c_min");
+	za_read_gauge (ksp, "c_max",    "cache_size", "c_max");
 
 	/* The "l2_size" value has disappeared from Solaris some time in
 	 * early 2013, and has only reappeared recently in Solaris 11.2.
@@ -177,7 +292,7 @@ static int za_read (void)
 	/* 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");
@@ -208,12 +323,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(__FreeBSD__) && !defined(KERNEL_LINUX) // Solaris
 	/* kstats chain already opened by update_kstat (using *kc), verify everything went fine. */
 	if (kc == NULL)
 	{