diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2018-03-17 10:47:05 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2018-03-17 10:47:05 +0100 |
| commit | 0cf3a5a22e65eacdca1f995af7497819de57c1d1 (patch) | |
| tree | 3a2635e9f84eaca6e26595c2174a83c71d98df9a /docs | |
| parent | fd78d32681c78dd81742dae6bb7b4b0da3d18010 (diff) | |
| download | psutil-0cf3a5a22e65eacdca1f995af7497819de57c1d1.tar.gz | |
update doc / HISTORY / CREDITS
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.rst | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/docs/index.rst b/docs/index.rst index 0f55a2e1..395fd688 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -266,11 +266,11 @@ Memory - **active** *(UNIX)*: memory currently in use or very recently used, and so it is in RAM. - **inactive** *(UNIX)*: memory that is marked as not used. - - **slab** *(Linux)*: in-kernel data structures cache. - **buffers** *(Linux, BSD)*: cache for things like file system metadata. - **cached** *(Linux, BSD)*: cache for various things. - **shared** *(Linux, BSD)*: memory that may be simultaneously accessed by multiple processes. + - **slab** *(Linux)*: in-kernel data structures cache. - **wired** *(BSD, OSX)*: memory that is marked to always stay in RAM. It is never moved to disk. @@ -293,11 +293,9 @@ Memory ... >>> - .. versionchanged:: 4.2.0 added *shared* metrics on Linux. - - .. versionchanged:: 4.4.0 *available* and *used* values on Linux are more - precise and match "free" cmdline utility. + .. versionchanged:: 4.2.0 added *shared* metric on Linux. + .. versionchanged:: 5.4.4 added *slab* metric on Linux. .. function:: swap_memory() |
