diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-05 16:16:48 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-05 16:16:48 +0000 |
commit | de94db5d61dddfada92dd07a2c1885d79c74e751 (patch) | |
tree | 9efc013166aa93919bdd4ace2304fdeb356ba751 | |
parent | 01cf2127bd3b3ec3be64a10991d6b3287d60a162 (diff) |
merge revision(s) r45760: [Backport #9796]
* 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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gc.c | 1 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -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() @@ -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 @@ -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" |