diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 20:14:51 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-05-22 20:14:51 +0000 |
commit | ed1c660b70a4be74d16ac1f4567ff642d03b7684 (patch) | |
tree | 5bf9be5e359888a490eb20cad83dc2a377faf36b | |
parent | 8d1d9260a23dd21e1c621c20895b209fd5ca867a (diff) |
merge -c 12267
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 14 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Thu May 10 10:14:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (rb_thread_priority): rdoc fix; the initial value is + inherited from the creating thread. [ruby-core:10607] + Wed May 23 04:22:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR. @@ -11468,10 +11468,12 @@ rb_thread_sleep_forever() /* * call-seq: * thr.priority => integer - * - * Returns the priority of <i>thr</i>. Default is zero; higher-priority threads - * will run before lower-priority threads. - * + * + * 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. + * * Thread.current.priority #=> 0 */ @@ -11486,10 +11488,10 @@ rb_thread_priority(thread) /* * call-seq: * thr.priority= integer => thr - * + * * Sets the priority of <i>thr</i> to <i>integer</i>. Higher-priority threads * will run before lower-priority threads. - * + * * count1 = count2 = 0 * a = Thread.new do * loop { count1 += 1 } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-05-23" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070523 -#define RUBY_PATCHLEVEL 19 +#define RUBY_PATCHLEVEL 20 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |