X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fprocesses.c;h=261accbcbc7582218c6f5744cb818beba533ffe8;hb=6f42db1a14f449f99963191f372c61d418bc8a08;hp=559ba972c81fe54d98fcc65225e8d1829f226912;hpb=de0fdb208de123fe753c5fcf03533833777a5b4a;p=collectd.git

diff --git a/src/processes.c b/src/processes.c
index 559ba972..261accbc 100644
--- a/src/processes.c
+++ b/src/processes.c
@@ -86,14 +86,13 @@
 #  endif
 /* #endif KERNEL_LINUX */
 
-#elif HAVE_LIBKVM_GETPROCS
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
 #  include <kvm.h>
+#  include <sys/param.h>
+#  include <sys/sysctl.h>
 #  include <sys/user.h>
 #  include <sys/proc.h>
-#  if HAVE_SYS_SYSCTL_H
-#    include <sys/sysctl.h>
-#  endif
-/* #endif HAVE_LIBKVM_GETPROCS */
+/* #endif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
 
 #else
 # error "No applicable input method."
@@ -178,9 +177,9 @@ static mach_msg_type_number_t     pset_list_len;
 static long pagesize_g;
 /* #endif KERNEL_LINUX */
 
-#elif HAVE_LIBKVM_GETPROCS
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
 /* no global variables */
-#endif /* HAVE_LIBKVM_GETPROCS */
+#endif /* HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
 
 /* put name of process from config to list_head_g tree
    list_head_g is a list of 'procstat_t' structs with
@@ -537,9 +536,9 @@ static int ps_init (void)
 			pagesize_g, CONFIG_HZ);
 /* #endif KERNEL_LINUX */
 
-#elif HAVE_LIBKVM_GETPROCS
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
 /* no initialization */
-#endif /* HAVE_LIBKVM_GETPROCS */
+#endif /* HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
 
 	return (0);
 } /* int ps_init */
@@ -1279,7 +1278,7 @@ static int ps_read (void)
 		ps_submit_proc_list (ps_ptr);
 /* #endif KERNEL_LINUX */
 
-#elif HAVE_LIBKVM_GETPROCS
+#elif HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD
 	int running  = 0;
 	int sleeping = 0;
 	int zombies  = 0;
@@ -1358,9 +1357,9 @@ static int ps_read (void)
 		pse.num_proc = 1;
 		pse.num_lwp  = procs[i].ki_numthreads;
 
-		/* pse.vmem_size = procs[i].ki_size; */
+		pse.vmem_size = procs[i].ki_size;
 		pse.vmem_rss = procs[i].ki_rssize * getpagesize();
-		/* pse.stack_size = procs[i].ki_ssize * getpagesize(); */
+		pse.stack_size = procs[i].ki_ssize * getpagesize();
 		pse.vmem_minflt = 0;
 		pse.vmem_minflt_counter = procs[i].ki_rusage.ru_minflt;
 		pse.vmem_majflt = 0;
@@ -1401,7 +1400,7 @@ static int ps_read (void)
 
 	for (ps_ptr = list_head_g; ps_ptr != NULL; ps_ptr = ps_ptr->next)
 		ps_submit_proc_list (ps_ptr);
-#endif /* HAVE_LIBKVM_GETPROCS */
+#endif /* HAVE_LIBKVM_GETPROCS && HAVE_STRUCT_KINFO_PROC_FREEBSD */
 
 	return (0);
 } /* int ps_read */