X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=8261282a825e1fc5ea13dea2bfacf222a35b4037;hb=ae6058aeb62cd1acdf94306404ed47b10115b89f;hp=2f89ddd9ee4bf451ec79751f77b4bd744a4024df;hpb=9bf6a43e84848f5526b875074ec2d19e2c3eb5ad;p=collectd.git

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index 2f89ddd9..8261282a 100644
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -28,6 +28,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -89,12 +90,10 @@ static long long get_zfs_value(kstat_t *ksp, const char *key)
 
 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)
+	for (llentry_t *e = llist_head (ksp); e != NULL; e = e->next)
 	{
 		sfree (e->key);
 		sfree (e->value);
@@ -269,11 +268,19 @@ static int za_read (void)
 #endif
 
 	/* Sizes */
-	za_read_gauge (ksp, "size",  "cache_size", "arc");
-	za_read_gauge (ksp, "c",     "cache_size", "c");
-	za_read_gauge (ksp, "p",     "cache_size", "p");
-	za_read_gauge (ksp, "c_min", "cache_size", "c_min");
-	za_read_gauge (ksp, "c_max", "cache_size", "c_max");
+	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.
@@ -287,10 +294,6 @@ static int za_read (void)
 	za_read_derive (ksp, "deleted",  "cache_operation", "deleted");
 #if defined(KERNEL_FREEBSD)
 	za_read_derive (ksp, "allocated","cache_operation", "allocated");
-#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
 #endif
 
 	/* Issue indicators */
@@ -312,6 +315,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");