Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/sysutils/collectd/patches/patch-src_swap.c
+++ b/sysutils/collectd/patches/patch-src_swap.c
@@ -0,0 +1,150 @@
+$NetBSD: patch-src_swap.c,v 1.2 2015/08/11 14:15:00 he Exp $
+
+Extend support for NetBSD, and add per-swap-device
+reporting for HAVE_SWAPCTL_THREE_ARGS.
+
+--- src/swap.c.orig	2015-05-20 12:04:47.000000000 +0000
+++ src/swap.c
+@@ -76,9 +76,12 @@ static _Bool report_bytes = 0;
+ static _Bool report_by_device = 0;
+ /* #endif KERNEL_LINUX */
+ 
+-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS
+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS)
+ # define SWAP_HAVE_REPORT_BY_DEVICE 1
+ static derive_t pagesize;
+#if KERNEL_NETBSD
+static _Bool report_bytes = 0;
+#endif
+ static _Bool report_by_device = 0;
+ /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
+ 
+@@ -114,7 +117,7 @@ static int swap_config (oconfig_item_t *
+ 	{
+ 		oconfig_item_t *child = ci->children + i;
+ 		if (strcasecmp ("ReportBytes", child->key) == 0)
+-#if KERNEL_LINUX
+#if KERNEL_LINUX || KERNEL_NETBSD
+ 			cf_util_get_boolean (child, &report_bytes);
+ #else
+ 			WARNING ("swap plugin: The \"ReportBytes\" option "
+@@ -147,7 +150,7 @@ static int swap_init (void) /* {{{ */
+ 	pagesize = (derive_t) sysconf (_SC_PAGESIZE);
+ /* #endif KERNEL_LINUX */
+ 
+-#elif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS
+#elif HAVE_SWAPCTL && (HAVE_SWAPCTL_TWO_ARGS || HAVE_SWAPCTL_THREE_ARGS)
+ 	/* getpagesize(3C) tells me this does not fail.. */
+ 	pagesize = (derive_t) getpagesize ();
+ /* #endif HAVE_SWAPCTL */
+@@ -213,7 +216,7 @@ static void swap_submit_usage (char cons
+ 				other_name, other_value, NULL);
+ } /* }}} void swap_submit_usage */
+ 
+-#if KERNEL_LINUX || HAVE_PERFSTAT
+#if KERNEL_LINUX || HAVE_PERFSTAT || KERNEL_NETBSD
+ __attribute__((nonnull(1)))
+ static void swap_submit_derive (char const *type_instance, /* {{{ */
+ 		derive_t value)
+@@ -614,6 +617,43 @@ static int swap_read (void) /* {{{ */
+ /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_TWO_ARGS */
+ 
+ #elif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS
+#if KERNEL_NETBSD
+#include <uvm/uvm_extern.h>
+
+static int
+swap_read_io (void) /* {{{ */
+{
+	static int uvmexp_mib[] = { CTL_VM, VM_UVMEXP2 };
+	struct uvmexp_sysctl uvmexp;
+	size_t ssize;
+	derive_t swap_in, swap_out;
+
+	ssize = sizeof(uvmexp);
+	memset(&uvmexp, 0, ssize);
+	if (sysctl(uvmexp_mib, __arraycount(uvmexp_mib), &uvmexp,
+		&ssize, NULL, 0) == -1) {
+			char errbuf[1024];
+			WARNING ("swap: sysctl for uvmexp failed: %s",
+				sstrerror (errno, errbuf, sizeof (errbuf)));
+			return (-1);
+	}
+
+	swap_in  = uvmexp.pgswapin;
+	swap_out = uvmexp.pgswapout;
+
+	if (report_bytes)
+	{
+		swap_in = swap_in * pagesize;
+		swap_out = swap_out * pagesize;
+	}
+
+	swap_submit_derive ("in",  swap_in);
+	swap_submit_derive ("out", swap_out);
+
+	return (0);
+} /* }}} */
+#endif
+
+ static int swap_read (void) /* {{{ */
+ {
+ 	struct swapent *swap_entries;
+@@ -660,23 +700,53 @@ static int swap_read (void) /* {{{ */
+ 	 * swap_entries[i].se_path */
+ 	for (i = 0; i < swap_num; i++)
+ 	{
+		char path[PATH_MAX];
+		gauge_t this_used;
+		gauge_t this_total;
+		
+ 		if ((swap_entries[i].se_flags & SWF_ENABLE) == 0)
+ 			continue;
+ 
+-		used  += ((gauge_t) swap_entries[i].se_inuse) * C_SWAP_BLOCK_SIZE;
+-		total += ((gauge_t) swap_entries[i].se_nblks) * C_SWAP_BLOCK_SIZE;
+-	}
+		this_used = ((gauge_t) swap_entries[i].se_inuse)
+			* C_SWAP_BLOCK_SIZE;
+		this_total = ((gauge_t) swap_entries[i].se_nblks)
+			* C_SWAP_BLOCK_SIZE;
+		
+		
+		/* Shortcut for the "combined" setting (default) */
+		if (!report_by_device)
+		{
+			used  += this_used;
+			total += this_total;
+			continue;
+		}
+
+		sstrncpy (path, swap_entries[i].se_path, sizeof (path));
+		escape_slashes (path, sizeof (path));
+
+		swap_submit_usage (path, this_used, this_total - this_used,
+				   NULL, NAN);
+	} /* for (swap_num) */
+
+ 
+ 	if (total < used)
+ 	{
+ 		ERROR ("swap plugin: Total swap space (%g) is less than used swap space (%g).",
+ 				total, used);
+		sfree (swap_entries);
+ 		return (-1);
+ 	}
+ 
+-	swap_submit_usage (NULL, used, total - used, NULL, NAN);
+	/* If the "separate" option was specified (report_by_device == 1), all
+	 * values have already been dispatched from within the loop. */
+	if (!report_by_device)
+		swap_submit_usage (NULL, used, total - used, NULL, NAN);
+ 
+ 	sfree (swap_entries);
+
+#if KERNEL_NETBSD
+	swap_read_io ();
+#endif
+ 	return (0);
+ } /* }}} int swap_read */
+ /* #endif HAVE_SWAPCTL && HAVE_SWAPCTL_THREE_ARGS */