Merge branch 'collectd-4.10' into collectd-5.0

[collectd.git] / src / zfs_arc.c

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index 63957f6..f886c86 100644 (file)
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -26,7 +26,7 @@
 /*
  * Global variables
  */
-static kstat_t *ksp;
+
 extern kstat_ctl_t *kc;
 
 static void za_submit (const char* type, const char* type_instance, value_t* values, int values_len)
@@ -86,8 +86,9 @@ static int za_read (void)
                 demand_metadata_misses,
                 prefetch_data_misses,
                 prefetch_metadata_misses;
-       gauge_t  arc_hits, arc_misses, arc_ratio, l2_hits, l2_misses, l2_ratio;
+       gauge_t  arc_hits, arc_misses, l2_hits, l2_misses;
        value_t  l2_io[2];
+       kstat_t  *ksp   = NULL;
 
        get_kstat (&ksp, "zfs", 0, "arcstats");
        if (ksp == NULL)
@@ -114,15 +115,15 @@ static int za_read (void)
        prefetch_data_misses     = get_kstat_value(ksp, "prefetch_data_misses");
        prefetch_metadata_misses = get_kstat_value(ksp, "prefetch_metadata_misses");
 
-       za_submit_derive ("cache_result", "hit-demand_data",       demand_data_hits);
-       za_submit_derive ("cache_result", "hit-demand_metadata",   demand_metadata_hits);
-       za_submit_derive ("cache_result", "hit-prefetch_data",     prefetch_data_hits);
-       za_submit_derive ("cache_result", "hit-prefetch_metadata", prefetch_metadata_hits);
+       za_submit_derive ("cache_result", "demand_data-hit",       demand_data_hits);
+       za_submit_derive ("cache_result", "demand_metadata-hit",   demand_metadata_hits);
+       za_submit_derive ("cache_result", "prefetch_data-hit",     prefetch_data_hits);
+       za_submit_derive ("cache_result", "prefetch_metadata-hit", prefetch_metadata_hits);
 
-       za_submit_derive ("cache_result", "miss-demand_data",       demand_data_misses);
-       za_submit_derive ("cache_result", "miss-demand_metadata",   demand_metadata_misses);
-       za_submit_derive ("cache_result", "miss-prefetch_data",     prefetch_data_misses);
-       za_submit_derive ("cache_result", "miss-prefetch_metadata", prefetch_metadata_misses);
+       za_submit_derive ("cache_result", "demand_data-miss",       demand_data_misses);
+       za_submit_derive ("cache_result", "demand_metadata-miss",   demand_metadata_misses);
+       za_submit_derive ("cache_result", "prefetch_data-miss",     prefetch_data_misses);
+       za_submit_derive ("cache_result", "prefetch_metadata-miss", prefetch_metadata_misses);
 
        /* Ratios */
        arc_hits   = (gauge_t) get_kstat_value(ksp, "hits");
@@ -144,8 +145,6 @@ static int za_read (void)
 
 static int za_init (void) /* {{{ */
 {
-       ksp = NULL;
-
        /* kstats chain already opened by update_kstat (using *kc), verify everything went fine. */
        if (kc == NULL)
        {