summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-12 05:42:17 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-12 05:42:17 +0000
commitdda8de065c1c7691ec8627d3024a61f324bc9f73 (patch)
tree0b47f326f6d7098b85b8a69bfeffcd80adeea471
parentaca69e1fdc8ebf75f80b665a9d42bedc2410bd7e (diff)
* vm.c (th_init): rename from th_init2.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--vm.c11
2 files changed, 7 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index f611d12..127069e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 12 14:42:11 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (th_init): rename from th_init2.
+
Sat Feb 12 14:41:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit.rb (Test::Unit::AutoRunner#initialize): use
diff --git a/vm.c b/vm.c
index 8017c42..5719425 100644
--- a/vm.c
+++ b/vm.c
@@ -1781,7 +1781,7 @@ thread_alloc(VALUE klass)
}
static void
-th_init2(rb_thread_t *th, VALUE self)
+th_init(rb_thread_t *th, VALUE self)
{
th->self = self;
@@ -1797,12 +1797,7 @@ th_init2(rb_thread_t *th, VALUE self)
th->status = THREAD_RUNNABLE;
th->errinfo = Qnil;
th->last_status = Qnil;
-}
-
-static void
-th_init(rb_thread_t *th, VALUE self)
-{
- th_init2(th, self);
+ th->waiting_fd = -1;
}
static VALUE
@@ -2142,7 +2137,7 @@ Init_BareVM(void)
ruby_current_vm = vm;
Init_native_thread();
- th_init2(th, 0);
+ th_init(th, 0);
th->vm = vm;
ruby_thread_init_stack(th);
}