aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-05 03:50:04 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-05 03:50:04 +0000
commit5e51e94304a30446108752829639247da23873ca (patch)
tree84dfaa93df999e41180776b07dc3ca9046a568fe
parent3be3c95ca0611e906c2aa5a23f067c646fa044a1 (diff)
downloadruby-5e51e94304a30446108752829639247da23873ca.tar.gz
* eval.c (rb_thread_initialize): Thread objects cannot be initialized
again. fixed: [ruby-core:04067] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog11
-rw-r--r--eval.c13
2 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c9296d9e1..b2a82812b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 5 12:49:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_initialize): Thread objects cannot be initialized
+ again. fixed: [ruby-core:04067]
+
Wed Jan 5 02:30:11 2005 Tanaka Akira <akr@m17n.org>
* random.c (init_by_array): imported from mt19937ar-cok.tgz.
@@ -13,7 +18,7 @@ Wed Jan 5 02:30:11 2005 Tanaka Akira <akr@m17n.org>
Tue Jan 4 21:25:43 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * test/drb/{test_drbssl.rb,test_drbunix.rb,ut_drb.rb}: use
+ * test/drb/{test_drbssl.rb,test_drbunix.rb,ut_drb.rb}: use
DRbService.ext_service. reduce sleep.
Mon Jan 3 14:01:54 2005 Tanaka Akira <akr@m17n.org>
@@ -28,7 +33,7 @@ Mon Jan 3 11:37:42 2005 Tanaka Akira <akr@m17n.org>
Mon Jan 3 11:03:37 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
- * test/drb/test_drb.rb: move TestDRbReusePort to new file.
+ * test/drb/test_drb.rb: move TestDRbReusePort to new file.
[ruby-dev:25238]
* test/drb/drbtest.rb: change timeout.
@@ -93,7 +98,7 @@ Sat Jan 1 16:21:29 2005 Minero Aoki <aamine@loveruby.net>
Sat Jan 1 04:20:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
- * ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
+ * ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
StringValue before GetSPKI. fixed: [ruby-dev:25359].
Fri Dec 31 14:10:43 2004 Dave Thomas <dave@pragprog.com>
diff --git a/eval.c b/eval.c
index b4e3ea96b7..7884297c32 100644
--- a/eval.c
+++ b/eval.c
@@ -11698,10 +11698,21 @@ static VALUE
rb_thread_initialize(thread, args)
VALUE thread, args;
{
+ rb_thread_t th;
+
if (!rb_block_given_p()) {
rb_raise(rb_eThreadError, "must be called with a block");
}
- return rb_thread_start_0(rb_thread_yield, args, rb_thread_check(thread));
+ th = rb_thread_check(thread);
+ if (th->stk_max) {
+ NODE *node = th->node;
+ if (!node) {
+ rb_raise(rb_eThreadError, "already initialized thread");
+ }
+ rb_raise(rb_eThreadError, "already initialized thread - %s:%d",
+ node->nd_file, nd_line(node));
+ }
+ return rb_thread_start_0(rb_thread_yield, args, th);
}