diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-31 04:27:02 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-31 04:27:02 +0000 |
commit | 488561c65522ea1c05c0ab5082d0f6442f1cf8c6 (patch) | |
tree | 6cd872032135d98fb164e9a8b78cba7c6a822d61 | |
parent | ee485d5d511794b3579ff8f33cae1dae1b3fb917 (diff) |
merge revision(s) 49036: [Backport #10660]
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | version.h | 6 | ||||
-rw-r--r-- | vm_core.h | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -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> * tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable. @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.0" -#define RUBY_RELEASE_DATE "2014-12-26" -#define RUBY_PATCHLEVEL 1 +#define RUBY_RELEASE_DATE "2014-12-31" +#define RUBY_PATCHLEVEL 2 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" @@ -975,7 +975,7 @@ rb_vm_living_threads_init(rb_vm_t *vm) static inline void 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++; } |