Skip to content
Browse files

* 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
  • Loading branch information...
1 parent 60d6d93 commit f40d2c967005e49914046bbc6a7a8c06c46b1d38 @akr akr committed Jun 5, 2010
Showing with 17 additions and 3 deletions.
  1. +12 −0 ChangeLog
  2. +0 −1 thread.c
  3. +1 −1 thread_pthread.c
  4. +1 −1 thread_win32.c
  5. +3 −0 vm.c
View
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]
View
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 */
{
View
2 thread_pthread.c
@@ -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();
View
2 thread_win32.c
@@ -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();
View
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);

0 comments on commit f40d2c9

Please sign in to comment.
Something went wrong with that request. Please try again.