archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 49036: [Backport #10660]

Browse source 
* vm_core.h (rb_vm_living_threads_insert): preserve order
	  [Bug #10660] [ruby-core:67154] [ruby-core:67159]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-12-31 04:27:02 +00:00
parent ee485d5d51
commit 488561c655
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Dec 31 13:26:22 2014 Eric Wong <e@80x24.org>
* vm_core.h (rb_vm_living_threads_insert): preserve order
[Bug #10660] [ruby-core:67154] [ruby-core:67159]
Fri Dec 26 15:42:27 2014 NAKAMURA Usaku <usa@ruby-lang.org> Fri Dec 26 15:42:27 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable. * tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable.

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2014-12-26" #define RUBY_RELEASE_DATE "2014-12-31"
#define RUBY_PATCHLEVEL 1 #define RUBY_PATCHLEVEL 2
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12
#define RUBY_RELEASE_DAY 26 #define RUBY_RELEASE_DAY 31
#include "ruby/version.h" #include "ruby/version.h"

2
vm_core.h
View file

@ -975,7 +975,7 @@ rb_vm_living_threads_init(rb_vm_t *vm)
static inline void static inline void
rb_vm_living_threads_insert(rb_vm_t *vm, rb_thread_t *th) rb_vm_living_threads_insert(rb_vm_t *vm, rb_thread_t *th)
{ {
list_add(&vm->living_threads, &th->vmlt_node); list_add_tail(&vm->living_threads, &th->vmlt_node);
vm->living_thread_num++; vm->living_thread_num++;
} }