summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--thread.c13
2 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bb2821a18..6c781ca5ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 15 22:41:47 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * thread.c (rb_thread_priority, rb_thread_priority_set): fix rdoc.
+ Lower-priority thread may run even if there are higher-priority
+ threads. See [ruby-dev:40977].
+
Thu Apr 15 22:33:35 2010 Yusuke Endoh <mame@tsg.ne.jp>
* lib/uri/ftp.rb (URI::FTP#set_path): added to correct handling of
diff --git a/thread.c b/thread.c
index 10d6047c74..40a3483b75 100644
--- a/thread.c
+++ b/thread.c
@@ -2142,8 +2142,11 @@ rb_thread_keys(VALUE self)
*
* Returns the priority of <i>thr</i>. Default is inherited from the
* current thread which creating the new thread, or zero for the
- * initial main thread; higher-priority threads will run before
- * lower-priority threads.
+ * initial main thread; higher-priority thread will run more frequently
+ * than lower-priority threads (but lower-priority threads can also run).
+ *
+ * This is just hint for Ruby thread scheduler. It may be ignored on some
+ * platform.
*
* Thread.current.priority #=> 0
*/
@@ -2162,7 +2165,11 @@ rb_thread_priority(VALUE thread)
* thr.priority= integer => thr
*
* Sets the priority of <i>thr</i> to <i>integer</i>. Higher-priority threads
- * will run before lower-priority threads.
+ * will run more frequently than lower-priority threads (but lower-priority
+ * threads can also run).
+ *
+ * This is just hint for Ruby thread scheduler. It may be ignored on some
+ * platform.
*
* count1 = count2 = 0
* a = Thread.new do