merge revision(s) r45760: [Backport ruby#9796]

nagachika · nagachika · commit 006bb0bf8b08 · 2014-05-05T16:16:48.000Z
* gc.c (gc_after_sweep): suppress unnecessary expanding heap.
	  Tomb heap pages are freed pages here, so expanding heap is
	  not required.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May  6 00:54:56 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (gc_after_sweep): suppress unnecessary expanding heap.
+	  Tomb heap pages are freed pages here, so expanding heap is
+	  not required.
+
 Mon May  5 02:35:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal()
diff --git a/gc.c b/gc.c
@@ -2972,7 +2972,6 @@ gc_after_sweep(rb_objspace_t *objspace)
     /* if heap_pages has unused pages, then assign them to increment */
     if (heap_pages_increment < heap_tomb->page_length) {
 	heap_pages_increment = heap_tomb->page_length;
-	heap_pages_expand_sorted(objspace);
     }
 
 #if RGENGC_PROFILE > 0
diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-05-05"
-#define RUBY_PATCHLEVEL 92
+#define RUBY_RELEASE_DATE "2014-05-06"
+#define RUBY_PATCHLEVEL 93
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
 
 #include "ruby/version.h"
 

Original file line number	Diff line number	Diff line change
`@@ -2972,7 +2972,6 @@ gc_after_sweep(rb_objspace_t *objspace)`
`2972`	`2972`	`/* if heap_pages has unused pages, then assign them to increment */`
`2973`	`2973`	`if (heap_pages_increment < heap_tomb->page_length) {`
`2974`	`2974`	`heap_pages_increment = heap_tomb->page_length;`
`2975`		`- heap_pages_expand_sorted(objspace);`
`2976`	`2975`	`}`
`2977`	`2976`
`2978`	`2977`	`#if RGENGC_PROFILE > 0`