nagachika	2014-05-06 01:16:48 +0900 (Tue, 06 May 2014)

  New Revision: 45833

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

  Log:
    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.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/gc.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45832)
+++ ruby_2_1/ChangeLog	(revision 45833)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue May  6 00:54:56 2014  Narihiro Nakamura  <authornari@g...>
+
+	* 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@r...>
 
 	* ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal()
Index: ruby_2_1/gc.c
===================================================================
--- ruby_2_1/gc.c	(revision 45832)
+++ ruby_2_1/gc.c	(revision 45833)
@@ -2972,7 +2972,6 @@ gc_after_sweep(rb_objspace_t *objspace) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/gc.c#L2972
     /* 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
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45832)
+++ ruby_2_1/version.h	(revision 45833)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45760


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