summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-15 01:56:52 +0000
committerzzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-15 01:56:52 +0000
commit89d8d7694cd235dfd89a821b7c4c9a41567c0d71 (patch)
treed8a6fe45a04ca311365d67d96ffffef02ddaa3ce
parent150b2655024892d48ca6af5f70731e2ab68a491f (diff)
* thread.c (mutex_sleep): [DOC] Awake thread will reacquire lock
By Tim Abdulla [Fixes GH-342] https://github.com/ruby/ruby/pull/342 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41977 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 299b5ccae25..c1b43629f9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 15 10:56:01 2013 Zachary Scott <e@zzak.io>
+
+ * thread.c (mutex_sleep): [DOC] Awake thread will reacquire lock
+ By Tim Abdulla [Fixes GH-342] https://github.com/ruby/ruby/pull/342
+
Mon Jul 15 10:45:09 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (nlz16): Use __builtin_clz if possible.
diff --git a/thread.c b/thread.c
index babec1f51ef..eaf408fa6d0 100644
--- a/thread.c
+++ b/thread.c
@@ -4562,6 +4562,9 @@ rb_mutex_sleep(VALUE self, VALUE timeout)
* non-nil or forever. Raises +ThreadError+ if +mutex+ wasn't locked by
* the current thread.
*
+ * When the thread is next woken up, it will attempt to reacquire
+ * the lock.
+ *
* Note that this method can wakeup without explicit Thread#wakeup call.
* For example, receiving signal and so on.
*/