From: Xin Li <delphij@FreeBSD.org>
Date: Thu, 30 May 2013 18:25:09 +0000 (-0700)
Subject: Implement ARC data collection on FreeBSD.
X-Git-Tag: collectd-5.4.0~29^2~3
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=95c5059366e252f2a5e847993d3a429a8c8aa7c5

Implement ARC data collection on FreeBSD.
---

diff --git a/configure.in b/configure.in
index ba52389e..27c6cd31 100644
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,10 @@ case $host_os in
 	AC_DEFINE([KERNEL_AIX], 1, [True if program is to be compiled for a AIX kernel])
 	ac_system="AIX"
 	;;
+	*freebsd*)
+	AC_DEFINE([KERNEL_FREEBSD], 1, [True if program is to be compiled for a FreeBSD kernel])
+	ac_system="FreeBSD"
+	;;
 	*)
 	ac_system="unknown"
 esac
@@ -1362,6 +1366,8 @@ fi
 m4_divert_once([HELP_WITH], [
 collectd additional packages:])
 
+AM_CONDITIONAL([BUILD_FREEBSD],[test "x$x$ac_system" = "xFreeBSD"])
+
 AM_CONDITIONAL([BUILD_AIX],[test "x$x$ac_system" = "xAIX"]) 
 
 if test "x$ac_system" = "xAIX"
@@ -4780,6 +4786,14 @@ then
         plugin_tcpconns="yes"
 fi
 
+# FreeBSD
+
+if test "x$ac_system" = "xFreeBSD"
+then
+        plugin_zfs_arc="yes"
+fi
+
+
 if test "x$with_perfstat" = "xyes"
 then
 	plugin_cpu="yes"
diff --git a/src/Makefile.am b/src/Makefile.am
index d67deca5..c3e596d4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1402,7 +1402,11 @@ pkglib_LTLIBRARIES += zfs_arc.la
 zfs_arc_la_SOURCES = zfs_arc.c
 zfs_arc_la_CFLAGS = $(AM_CFLAGS)
 zfs_arc_la_LDFLAGS = -module -avoid-version
+if BUILD_FREEBSD
+zfs_arc_la_LIBADD = -lm
+else
 zfs_arc_la_LIBADD = -lkstat
+endif
 collectd_LDADD += "-dlopen" zfs_arc.la
 collectd_DEPENDENCIES += zfs_arc.la
 endif
diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index aa900193..b8bccde7 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -29,8 +29,46 @@
  * Global variables
  */
 
+#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 <sys/types.h>
+#include <sys/sysctl.h>
+
+const char zfs_arcstat[] = "kstat.zfs.misc.arcstats.";
+
+#if !defined(kstat_t)
+typedef void kstat_t;
+#endif
+
+static long long get_zfs_value(void * dummy __unused, const char *kstat_value)
+{
+	long long value;
+	size_t valuelen = sizeof(value);
+	int rv;
+	char *key;
+
+	key = ssnprintf_alloc("%s%s", zfs_arcstat, kstat_value);
+	if (key != NULL) {
+		if (strlen(key) > 0) {
+			rv = sysctlbyname(key, (void *)&value, &valuelen, NULL, (size_t)0);
+			free(key);
+			if (rv == 0)
+				return (value);
+		} else
+			free(key);
+	}
+
+	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;
@@ -60,7 +98,7 @@ static int za_read_derive (kstat_t *ksp, const char *kstat_value,
   long long tmp;
   value_t v;
 
-  tmp = get_kstat_value (ksp, (char *)kstat_value);
+  tmp = get_zfs_value (ksp, (char *)kstat_value);
   if (tmp == -1LL)
   {
     ERROR ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
@@ -78,7 +116,7 @@ static int za_read_gauge (kstat_t *ksp, const char *kstat_value,
   long long tmp;
   value_t v;
 
-  tmp = get_kstat_value (ksp, (char *)kstat_value);
+  tmp = get_zfs_value (ksp, (char *)kstat_value);
   if (tmp == -1LL)
   {
     ERROR ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
@@ -111,12 +149,14 @@ static int za_read (void)
 	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 */
 	za_read_gauge (ksp, "size",    "cache_size", "arc");
@@ -147,17 +187,17 @@ static int za_read (void)
 	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);
 
@@ -166,12 +206,14 @@ static int za_read (void)
 
 static int za_init (void) /* {{{ */
 {
+#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 */