kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
* 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
This commit is contained in:
nagachika 2014-05-05 16:16:48 +00:00
parent 01cf2127bd
commit de94db5d61
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Mon May 5 02:35:20 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal() * ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal()

1
gc.c
View file

@ -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 has unused pages, then assign them to increment */
if (heap_pages_increment < heap_tomb->page_length) { if (heap_pages_increment < heap_tomb->page_length) {
heap_pages_increment = heap_tomb->page_length; heap_pages_increment = heap_tomb->page_length;
heap_pages_expand_sorted(objspace);
} }
#if RGENGC_PROFILE > 0 #if RGENGC_PROFILE > 0

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-05-05" #define RUBY_RELEASE_DATE "2014-05-06"
#define RUBY_PATCHLEVEL 92 #define RUBY_PATCHLEVEL 93
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 5 #define RUBY_RELEASE_DAY 6
#include "ruby/version.h" #include "ruby/version.h"