From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 8 Jan 2014 17:28:07 +0000 (+0100)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54ef2ae58f8ef125cf1d3aefe3ac839ba7e67f8a;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
	src/zfs_arc.c
---

54ef2ae58f8ef125cf1d3aefe3ac839ba7e67f8a
diff --cc src/zfs_arc.c
index 2edba6d1b,cc988625b..96ffc5495
--- a/src/zfs_arc.c
+++ b/src/zfs_arc.c
@@@ -96,10 -60,10 +96,10 @@@ static int za_read_derive (kstat_t *ksp
    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);
+     WARNING ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
      return (-1);
    }
  
@@@ -114,10 -78,10 +114,10 @@@ static int za_read_gauge (kstat_t *ksp
    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);
+     WARNING ("zfs_arc plugin: Reading kstat value \"%s\" failed.", kstat_value);
      return (-1);
    }
  
@@@ -160,16 -122,18 +160,18 @@@ 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");
+ #if __FreeBSD__
+ 	za_read_derive (ksp, "allocated","cache_operation", "allocated");
  	za_read_derive (ksp, "stolen",   "cache_operation", "stolen");
+ #endif
  
 -        /* 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");