summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--process.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index abf081408a..6553b0e7bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 14 17:42:21 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+
+ * process.c (rb_proc_times): improve documentation.
+ [ruby-core:35785] fixes #4581, reported by Andrew Grimm.
+
Sat May 14 12:12:54 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
* test/openssl/test_pkey_dsa.rb: Add basic tests and tests that
diff --git a/process.c b/process.c
index d2a13e5509..0f60cfb940 100644
--- a/process.c
+++ b/process.c
@@ -5611,12 +5611,12 @@ p_gid_switch(VALUE obj)
* call-seq:
* Process.times -> aStructTms
*
- * Returns a <code>Tms</code> structure (see <code>Struct::Tms</code>
- * on page 388) that contains user and system CPU times for this
- * process.
+ * Returns a <code>Tms</code> structure (see <code>Struct::Tms</code>)
+ * that contains user and system CPU times for this process,
+ * and also for children processes.
*
* t = Process.times
- * [ t.utime, t.stime ] #=> [0.0, 0.02]
+ * [ t.utime, t.stime, t.cutime, t.cstime ] #=> [0.0, 0.02, 0.00, 0.00]
*/
VALUE