Merge remote-tracking branch 'github/pr/387'

[collectd.git] / src / zfs_arc.c

diff --git a/src/zfs_arc.c b/src/zfs_arc.c
index cd0c8414b114eadb605c1e39a4ace65e1ea92399..2edba6d1b68d4abc803b06145d6b2f5376503eca 100644 (file)
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@ -49,23 +49,19 @@ const char zfs_arcstat[] = "kstat.zfs.misc.arcstats.";
 typedef void kstat_t;
 #endif
 
-static long long get_zfs_value(void * dummy __unused, const char *kstat_value)
+static long long get_zfs_value(kstat_t *dummy __attribute__((unused)),
+               char const *name)
 {
+       char buffer[256];
        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);
-       }
+
+       ssnprintf (buffer, sizeof (buffer), "%s%s", zfs_arcstat, name);
+       rv = sysctlbyname (buffer, (void *) &value, &valuelen,
+                       /* new value = */ NULL, /* new length = */ (size_t) 0);
+       if (rv == 0)
+               return (value);
 
        return (-1);
 }
@@ -164,16 +160,16 @@ static int za_read (void)
        za_read_gauge (ksp, "size",    "cache_size", "arc");
        za_read_gauge (ksp, "l2_size", "cache_size", "L2");
 
-        /* Operations */
+       /* Operations */
        za_read_derive (ksp, "allocated","cache_operation", "allocated");
        za_read_derive (ksp, "deleted",  "cache_operation", "deleted");
        za_read_derive (ksp, "stolen",   "cache_operation", "stolen");
 
-        /* Issue indicators */
-        za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss");
+       /* Issue indicators */
+       za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss");
        za_read_derive (ksp, "hash_collisions", "hash_collisions", "");
        
-        /* Evictions */
+       /* Evictions */
        za_read_derive (ksp, "evict_l2_cached",     "cache_eviction", "cached");
        za_read_derive (ksp, "evict_l2_eligible",   "cache_eviction", "eligible");
        za_read_derive (ksp, "evict_l2_ineligible", "cache_eviction", "ineligible");