Merge pull request #1743 from rubenk/apcups-coverity

[collectd.git] / src / zfs_arc.c

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index 300fda2..37a918b 100644 (file)
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -269,10 +269,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, "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.
@@ -295,6 +304,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", "");
+       za_read_derive (ksp, "memory_throttle_count", "memory_throttle_count", "");
 
        /* Evictions */
        za_read_derive (ksp, "evict_l2_cached",     "cache_eviction", "cached");
@@ -310,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");