#12 support net/openbsd boottime using sysctl

Author: Vincent Landgraf

ext/vmstat/extconf.rb

@@ -46,8 +46,9 @@
 have_const 'NETLINK_GENERIC', sys_headers
 have_const 'IFMIB_IFDATA', sys_headers
 have_const 'IFDATA_GENERAL', sys_headers
-have_const 'CTL_KERN', sys_headers
-have_const 'KERN_BOOTTIME', sys_headers
+
+have_const 'CTL_KERN', ['sys/sysctl.h', 'sys/types.h']
+have_const 'KERN_BOOTTIME', ['sys/sysctl.h', 'sys/types.h']
 
 # bsd.h
 # only if we have *bsd like stats check for sysctlbyname

ext/vmstat/hw/sysctl.h

@@ -1,22 +1,31 @@
-#if defined(HAVE_SYS_SYSCTL_H) && \
-    defined(HAVE_SYS_TYPES_H) && \
-    defined(HAVE_SYS_SOCKET_H) && \
-    defined(HAVE_NET_IF_H) && \
-    defined(HAVE_NET_IF_MIB_H) && \
-    defined(HAVE_NET_IF_TYPES_H) && \
-    defined(HAVE_GETLOADAVG) && \
-    defined(HAVE_SYSCTL) && \
-    defined(HAVE_TYPE_STRUCT_IFMIBDATA) && \
-    defined(HAVE_CONST_CTL_NET) && \
-    defined(HAVE_CONST_PF_LINK) && \
-    defined(HAVE_CONST_NETLINK_GENERIC) && \
-    defined(HAVE_CONST_IFMIB_IFDATA) && \
-    defined(HAVE_CONST_IFDATA_GENERAL) && \
-    defined(HAVE_CONST_CTL_KERN) && \
-    defined(HAVE_CONST_KERN_BOOTTIME)
+#if defined(HAVE_SYS_SYSCTL_H) &&  defined(HAVE_SYS_TYPES_H) && \
+    defined(HAVE_CONST_CTL_KERN) && defined(HAVE_CONST_KERN_BOOTTIME)
 #include <vmstat.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
+
+#ifndef VMSTAT_BOOT_TIME
+#define VMSTAT_BOOT_TIME
+static int BOOT_TIME_MIB[] = { CTL_KERN, KERN_BOOTTIME };
+
+VALUE vmstat_boot_time(VALUE self) {
+  struct timeval tv;
+  size_t size = sizeof(tv);
+
+  if (sysctl(BOOT_TIME_MIB, 2, &tv, &size, NULL, 0) == 0) {
+    return rb_time_new(tv.tv_sec, tv.tv_usec);
+  } else {
+    return Qnil;
+  }
+}
+#endif // VMSTAT_BOOT_TIME
+
+#if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_NET_IF_H) && \
+    defined(HAVE_NET_IF_MIB_H) && defined(HAVE_NET_IF_TYPES_H) && \
+    defined(HAVE_GETLOADAVG) && defined(HAVE_SYSCTL) && \
+    defined(HAVE_TYPE_STRUCT_IFMIBDATA) && defined(HAVE_CONST_CTL_NET) && \
+    defined(HAVE_CONST_PF_LINK) && defined(HAVE_CONST_NETLINK_GENERIC) && \
+    defined(HAVE_CONST_IFMIB_IFDATA) && defined(HAVE_CONST_IFDATA_GENERAL)
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_mib.h>
@@ -52,21 +61,6 @@ VALUE vmstat_network_interfaces(VALUE self) {
 
   return devices;
 }
-#endif
-
-#ifndef VMSTAT_BOOT_TIME
-#define VMSTAT_BOOT_TIME
-static int BOOT_TIME_MIB[] = { CTL_KERN, KERN_BOOTTIME };
-
-VALUE vmstat_boot_time(VALUE self) {
-  struct timeval tv;
-  size_t size = sizeof(tv);
-
-  if (sysctl(BOOT_TIME_MIB, 2, &tv, &size, NULL, 0) == 0) {
-    return rb_time_new(tv.tv_sec, tv.tv_usec);
-  } else {
-    return Qnil;
-  }
-}
+#endif // VMSTAT_NETWORK_INTERFACES
 #endif
 #endif