Merge pull request #1983 from vlvkobal/master

[netdata.git] / src / plugin_freebsd.h

diff --git a/src/plugin_freebsd.h b/src/plugin_freebsd.h
index 357d86979081d33bf80de0dcdfbecba09debc87b..166c64338b206d34654a2d88ed38cac29b390fc4 100644 (file)
--- a/src/plugin_freebsd.h
+++ b/src/plugin_freebsd.h
@@ -8,7 +8,33 @@ void *freebsd_main(void *ptr);
 extern int freebsd_plugin_init();
 
 extern int do_vm_loadavg(int update_every, usec_t dt);
-extern int do_freebsd_sysctl_old(int update_every, usec_t dt);
+extern int do_vm_vmtotal(int update_every, usec_t dt);
+extern int do_kern_cp_time(int update_every, usec_t dt);
+extern int do_kern_cp_times(int update_every, usec_t dt);
+extern int do_hw_intcnt(int update_every, usec_t dt);
+extern int do_vm_stats_sys_v_intr(int update_every, usec_t dt);
+extern int do_vm_stats_sys_v_soft(int update_every, usec_t dt);
+extern int do_vm_stats_sys_v_swtch(int update_every, usec_t dt);
+extern int do_vm_stats_sys_v_forks(int update_every, usec_t dt);
+extern int do_vm_swap_info(int update_every, usec_t dt);
+extern int do_system_ram(int update_every, usec_t dt);
+extern int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt);
+extern int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt);
+extern int do_kern_ipc_sem(int update_every, usec_t dt);
+extern int do_kern_ipc_shm(int update_every, usec_t dt);
+extern int do_kern_ipc_msq(int update_every, usec_t dt);
+extern int do_uptime(int update_every, usec_t dt);
+extern int do_net_isr(int update_every, usec_t dt);
+extern int do_net_inet_tcp_states(int update_every, usec_t dt);
+extern int do_net_inet_tcp_stats(int update_every, usec_t dt);
+extern int do_net_inet_udp_stats(int update_every, usec_t dt);
+extern int do_net_inet_icmp_stats(int update_every, usec_t dt);
+extern int do_net_inet_ip_stats(int update_every, usec_t dt);
+extern int do_net_inet6_ip6_stats(int update_every, usec_t dt);
+extern int do_net_inet6_icmp6_stats(int update_every, usec_t dt);
+extern int do_getifaddrs(int update_every, usec_t dt);
+extern int do_getmntinfo(int update_every, usec_t dt);
+extern int do_kern_devstat(int update_every, usec_t dt);
 
 #define GETSYSCTL_MIB(name, mib) getsysctl_mib(name, mib, sizeof(mib)/sizeof(int))
 
@@ -28,6 +54,7 @@ static inline int getsysctl_mib(const char *name, int *mib, size_t len)
 }
 
 #define GETSYSCTL_SIMPLE(name, mib, var) getsysctl_simple(name, mib, sizeof(mib)/sizeof(int), &(var), sizeof(var))
+#define GETSYSCTL_WSIZE(name, mib, var, size) getsysctl_simple(name, mib, sizeof(mib)/sizeof(int), var, size)
 
 static inline int getsysctl_simple(const char *name, int *mib, size_t miblen, void *ptr, size_t len)
 {
@@ -64,7 +91,7 @@ static inline int getsysctl(const char *name, int *mib, size_t miblen, void *ptr
         error("FREEBSD: sysctl(%s...) failed: %s", name, strerror(errno));
         return 1;
     }
-    if (unlikely(nlen != *len)) {
+    if (unlikely(ptr != NULL && nlen != *len)) {
         error("FREEBSD: sysctl(%s...) expected %lu, got %lu", name, (unsigned long)*len, (unsigned long)nlen);
         return 1;
     }