summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-02-29 12:39:41 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2016-02-29 12:39:41 +0100
commit47199f2a15b5c6b6dc3f18e87cbea687c52bac13 (patch)
treed95bf61dbe5d806ea1d124965041d43fdfa0955a
parent350eeb16435c159b7d5403038e9fc137e12078f3 (diff)
downloadpsutil-47199f2a15b5c6b6dc3f18e87cbea687c52bac13.tar.gz
update doc
-rw-r--r--HISTORY.rst2
-rw-r--r--docs/index.rst5
2 files changed, 7 insertions, 0 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 5ba233b8..9dfb8d0f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,8 @@ Bug tracker at https://github.com/giampaolo/psutil/issues
- #777: [Linux] Process.open_files() on Linux return 3 new fields: position,
mode and flags.
+- #779: [Linux, BSD, SunOS]: Process.cpu_times() returns two new fields:
+ 'children_user' and 'children_system'.
**Bug fixes**
diff --git a/docs/index.rst b/docs/index.rst
index b6cf4d91..9d4b8c22 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -919,10 +919,15 @@ Process class
times which means the amount of time expressed in seconds that a process
has spent in
`user / system mode <http://stackoverflow.com/questions/556405/what-do-real-user-and-sys-mean-in-the-output-of-time1>`__.
+ On Linux, BSD and SunOS it also return two extra fields: **children_user**
+ and **children_system**.
This is similar to
`os.times() <http://docs.python.org//library/os.html#os.times>`__
but can be used for any process PID.
+ .. versionchanged:: 4.1.0 return two extra fields on Linux, BSD and SunOS:
+ *children_user* and *children_system*.
+
.. method:: cpu_percent(interval=None)
Return a float representing the process CPU utilization as a percentage.