mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
60d6d93b28
commit
f40d2c9670
5 changed files with 17 additions and 3 deletions
12
ChangeLog
12
ChangeLog
|
@ -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>
|
||||
|
||||
* NEWS: Enumerable#join has been reverted. [ruby-core:30604]
|
||||
|
|
1
thread.c
1
thread.c
|
@ -4239,7 +4239,6 @@ Init_Thread(void)
|
|||
rb_define_method(rb_cThread, "add_trace_func", thread_add_trace_func_m, 1);
|
||||
|
||||
/* init thread core */
|
||||
Init_native_thread();
|
||||
{
|
||||
/* main thread setting */
|
||||
{
|
||||
|
|
|
@ -163,7 +163,7 @@ ruby_thread_set_native(rb_thread_t *th)
|
|||
return pthread_setspecific(ruby_native_thread_key, th) == 0;
|
||||
}
|
||||
|
||||
static void
|
||||
void
|
||||
Init_native_thread(void)
|
||||
{
|
||||
rb_thread_t *th = GET_THREAD();
|
||||
|
|
|
@ -44,7 +44,7 @@ ruby_thread_set_native(rb_thread_t *th)
|
|||
return TlsSetValue(ruby_native_thread_key, th);
|
||||
}
|
||||
|
||||
static void
|
||||
void
|
||||
Init_native_thread(void)
|
||||
{
|
||||
rb_thread_t *th = GET_THREAD();
|
||||
|
|
3
vm.c
3
vm.c
|
@ -2110,6 +2110,8 @@ struct rb_objspace *rb_objspace_alloc(void);
|
|||
#endif
|
||||
void ruby_thread_init_stack(rb_thread_t *th);
|
||||
|
||||
extern void Init_native_thread(void);
|
||||
|
||||
void
|
||||
Init_BareVM(void)
|
||||
{
|
||||
|
@ -2130,6 +2132,7 @@ Init_BareVM(void)
|
|||
#endif
|
||||
ruby_current_vm = vm;
|
||||
|
||||
Init_native_thread();
|
||||
th_init2(th, 0);
|
||||
th->vm = vm;
|
||||
ruby_thread_init_stack(th);
|
||||
|
|
Loading…
Reference in a new issue