diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | vm_dump.c | 4 |
3 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Wed Mar 11 13:28:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in: check also procstat_getvmmap, which is not + available on FreeBSD 9. [ruby-core:68468] [Bug #10954] + + * vm_dump.c (procstat_vm): use kinfo_getvmmap instead if + procstat_getvmmap is not available. + Wed Mar 11 09:15:21 2015 Koichi Sasada <ko1@atdot.net> * internal.h: define struct MEMO. diff --git a/configure.in b/configure.in index 88a13a3475..e278261c6f 100644 --- a/configure.in +++ b/configure.in @@ -3143,6 +3143,9 @@ fi AS_CASE(["$target_os"], [freebsd*], [ AC_CHECK_LIB([procstat], [procstat_open_sysctl]) + if test "x$ac_cv_lib_procstat_procstat_open_sysctl" = xyes; then + AC_CHECK_FUNCS(procstat_getvmmap) + fi ]) AS_CASE(["$target_cpu-$target_os"], [*-darwin*], [ @@ -735,7 +735,11 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp) ptrwidth, "START", ptrwidth, "END", "PRT", "RES", "PRES", "REF", "SHD", "FL", "TP", "PATH"); +#ifdef HAVE_PROCSTAT_GETVMMAP freep = procstat_getvmmap(procstat, kipp, &cnt); +#else + freep = kinfo_getvmmap(kipp->ki_pid, &cnt); +#endif if (freep == NULL) return; for (i = 0; i < cnt; i++) { |