Merge branch 'V5-6-patches' into V5-7-patches
* V5-6-patches:
Fix paging statistics for OpenBSD 5.4
diff --git a/agent/mibgroup/hardware/cpu/cpu_sysctl.c b/agent/mibgroup/hardware/cpu/cpu_sysctl.c
index b5bfbed..5ecb68e 100644
--- a/agent/mibgroup/hardware/cpu/cpu_sysctl.c
+++ b/agent/mibgroup/hardware/cpu/cpu_sysctl.c
@@ -113,8 +113,13 @@
#define NS_VM_SWTCH swtch
#define NS_VM_PAGEIN pageins
#define NS_VM_PAGEOUT pdpageouts
+#ifdef HAVE_STRUCT_UVMEXP_PGSWAPIN
+ #define NS_VM_SWAPIN pgswapin
+ #define NS_VM_SWAPOUT pgswapout
+#else
#define NS_VM_SWAPIN swapins
#define NS_VM_SWAPOUT swapouts
+#endif
#if defined(VM_UVMEXP2) /* NetBSD 1.6+ */
#define NETSNMP_VM_STATS VM_UVMEXP2
diff --git a/configure b/configure
index d252395..b7d6fb0 100755
--- a/configure
+++ b/configure
@@ -26546,6 +26546,24 @@
fi
+# struct uvmexp
+#
+ac_fn_c_check_member "$LINENO" "struct uvmexp" "pgswapin" "ac_cv_member_struct_uvmexp_pgswapin" "
+ $ac_includes_default
+
+#include <uvm/uvm_extern.h>
+
+"
+if test "x$ac_cv_member_struct_uvmexp_pgswapin" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UVMEXP_PGSWAPIN 1
+_ACEOF
+
+
+fi
+
+
# struct nlist
#
ac_fn_c_check_member "$LINENO" "struct nlist" "n_value" "ac_cv_member_struct_nlist_n_value" "
diff --git a/configure.d/config_os_struct_members b/configure.d/config_os_struct_members
index a62e661..7f6b2c0 100644
--- a/configure.d/config_os_struct_members
+++ b/configure.d/config_os_struct_members
@@ -135,6 +135,14 @@
#endif
]])
+# struct uvmexp
+#
+AC_CHECK_MEMBERS([struct uvmexp.pgswapin],,,[
+ AC_INCLUDES_DEFAULT()
+ [
+#include <uvm/uvm_extern.h>
+ ]])
+
# struct nlist
#
AC_CHECK_MEMBERS([struct nlist.n_value,
diff --git a/include/net-snmp/net-snmp-config.h.in b/include/net-snmp/net-snmp-config.h.in
index 89cc0d8..84af89a 100644
--- a/include/net-snmp/net-snmp-config.h.in
+++ b/include/net-snmp/net-snmp-config.h.in
@@ -1008,6 +1008,9 @@
/* Define to 1 if `udps_opackets' is a member of `struct udpstat'. */
#undef HAVE_STRUCT_UDPSTAT_UDPS_OPACKETS
+/* Define to 1 if `pgswapin' is a member of `struct uvmexp'. */
+#undef HAVE_STRUCT_UVMEXP_PGSWAPIN
+
/* Define to 1 if you have the `sysconf' function. */
#undef HAVE_SYSCONF
