aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-29 15:55:44 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-29 15:55:44 +0000
commit3a9117011fdbcfd75e84cf5c0006bf357a20f959 (patch)
treedc9fd3e3ef2f858a1da47a1ce8c8806b54bb8bc2
parentb3ad7b9ea14bd28606e871a6be9a7dba6201cb3d (diff)
downloadruby-3a9117011fdbcfd75e84cf5c0006bf357a20f959.tar.gz
* thread.c (rb_thread_stop): change RDoc sample code. The old
example is buggy and may cause deadlock. The patch is suggested by Heesob Park <phasis@gmail.com>. Thank you! [Bug #3606][ruby-core:31454] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--thread.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fad7a8fe3..05d50463c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jun 30 00:54:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (rb_thread_stop): change RDoc sample code. The old
+ example is buggy and may cause deadlock. The patch is
+ suggested by Heesob Park <phasis@gmail.com>. Thank you!
+ [Bug #3606][ruby-core:31454]
+
Thu Jun 30 00:49:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread.c (rb_thread_wakeup): change RDoc sample code. The old
diff --git a/thread.c b/thread.c
index 894c7909ea..081dce4a02 100644
--- a/thread.c
+++ b/thread.c
@@ -1660,7 +1660,7 @@ rb_thread_run(VALUE thread)
* and schedules execution of another thread.
*
* a = Thread.new { print "a"; Thread.stop; print "c" }
- * Thread.pass
+ * sleep 0.1 while a.status!='sleep'
* print "b"
* a.run
* a.join