nagachika	2015-04-14 23:35:55 +0900 (Tue, 14 Apr 2015)

  New Revision: 50315

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50315

  Log:
    merge revision(s) 49930: [Backport #10954]
    
    * 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.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/configure.in
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm_dump.c
Index: ruby_2_2/configure.in
===================================================================
--- ruby_2_2/configure.in	(revision 50314)
+++ ruby_2_2/configure.in	(revision 50315)
@@ -3085,6 +3085,9 @@ fi https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L3085
 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*], [
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50314)
+++ ruby_2_2/ChangeLog	(revision 50315)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Apr 14 23:33:39 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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.
+
 Mon Apr 13 22:11:21 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* ext/openssl/lib/openssl/ssl.rb: stricter hostname verification
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50314)
+++ ruby_2_2/version.h	(revision 50315)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-04-14"
-#define RUBY_PATCHLEVEL 96
+#define RUBY_PATCHLEVEL 97
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_2/vm_dump.c
===================================================================
--- ruby_2_2/vm_dump.c	(revision 50314)
+++ ruby_2_2/vm_dump.c	(revision 50315)
@@ -735,7 +735,11 @@ procstat_vm(struct procstat *procstat, s https://github.com/ruby/ruby/blob/trunk/ruby_2_2/vm_dump.c#L735
 		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++) {

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49930


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/