archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* vm.c (Init_BareVM): call Init_native_thread here.

Browse source 
* thread.c (Init_Thread): don't call Init_native_thread.

* thread_pthread.c (Init_native_thread): exported.

* thread_win32.c (Init_native_thread): ditto.

[ruby-dev:41536]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-06-05 23:26:43 +00:00
parent 81cd7b07b8
commit 366ff21e06
5 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Sun Jun 6 08:26:01 2010 Tanaka Akira <akr@fsij.org>
* vm.c (Init_BareVM): call Init_native_thread here.
* thread.c (Init_Thread): don't call Init_native_thread.
* thread_pthread.c (Init_native_thread): exported.
* thread_win32.c (Init_native_thread): ditto.
[ruby-dev:41536]
Sun Jun 6 08:21:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Jun 6 08:21:17 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* NEWS: Enumerable#join has been reverted. [ruby-core:30604] * NEWS: Enumerable#join has been reverted. [ruby-core:30604]

1
thread.c
View file

@ -4239,7 +4239,6 @@ Init_Thread(void)
rb_define_method(rb_cThread, "add_trace_func", thread_add_trace_func_m, 1); rb_define_method(rb_cThread, "add_trace_func", thread_add_trace_func_m, 1);
/* init thread core */ /* init thread core */
Init_native_thread();
{ {
/* main thread setting */ /* main thread setting */
{ {

2
thread_pthread.c
View file

@ -163,7 +163,7 @@ ruby_thread_set_native(rb_thread_t *th)
return pthread_setspecific(ruby_native_thread_key, th) == 0; return pthread_setspecific(ruby_native_thread_key, th) == 0;
} }
static void void
Init_native_thread(void) Init_native_thread(void)
{ {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();

2
thread_win32.c
View file

@ -44,7 +44,7 @@ ruby_thread_set_native(rb_thread_t *th)
return TlsSetValue(ruby_native_thread_key, th); return TlsSetValue(ruby_native_thread_key, th);
} }
static void void
Init_native_thread(void) Init_native_thread(void)
{ {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();

3
vm.c
View file

@ -2110,6 +2110,8 @@ struct rb_objspace *rb_objspace_alloc(void);
#endif #endif
void ruby_thread_init_stack(rb_thread_t *th); void ruby_thread_init_stack(rb_thread_t *th);
extern void Init_native_thread(void);
void void
Init_BareVM(void) Init_BareVM(void)
{ {
@ -2130,6 +2132,7 @@ Init_BareVM(void)
#endif #endif
ruby_current_vm = vm; ruby_current_vm = vm;
Init_native_thread();
th_init2(th, 0); th_init2(th, 0);
th->vm = vm; th->vm = vm;
ruby_thread_init_stack(th); ruby_thread_init_stack(th);