summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-12-27 00:07:56 +0000
committerGiampaolo Rodola <g.rodola@gmail.com>2015-12-27 00:07:56 +0000
commitddbd245f4ccdfbbe6ef2c93452ca76b94e4153f7 (patch)
tree61a919e3022e6050490aad1ed3f4db65126b67df
parentbce1d8bf4aec80802092699bc226c6b04aa6ebcb (diff)
downloadpsutil-ddbd245f4ccdfbbe6ef2c93452ca76b94e4153f7.tar.gz
update doc
-rw-r--r--HISTORY.rst14
-rw-r--r--docs/index.rst54
-rw-r--r--psutil/__init__.py2
3 files changed, 35 insertions, 35 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 4f31be7d..f79bd8d6 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,11 @@ Bug tracker at https://github.com/giampaolo/psutil/issues
3.4.2 - XXXX-XX-XX
==================
+**Enhancements**
+
+- #728: [Solaris] exposed psutil.PROCFS_PATH constant to change the default
+ location of /proc filesystem.
+
**Bug fixes**
- #730: [FreeBSD] psutil.virtual_memory() crashes.
@@ -1117,11 +1122,4 @@ DeprecationWarning.
- #23: Special case for pid_exists(0)
- #24: [Windows] Process(0).kill() now raises AccessDenied exception instead
of WindowsError.
-- #30: psutil.get_pid_list() was returning two instances of PID 0 on OSX and
- FreeBSD platforms.
-
-
-0.1.0 - 2009-01-27
-==================
-
-- Initial release.
+- #30: psutil.get_pid_list() was returning two ins
diff --git a/docs/index.rst b/docs/index.rst
index 83adef37..8b900b7e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -980,29 +980,29 @@ Process class
representing extended memory information about the process.
All numbers are expressed in bytes.
- +--------+---------+-------+-------+--------------------+
- | Linux | OSX | BSD | SunOS | Windows |
- +========+=========+=======+=======+====================+
- | rss | rss | rss | rss | num_page_faults |
- +--------+---------+-------+-------+--------------------+
- | vms | vms | vms | vms | peak_wset |
- +--------+---------+-------+-------+--------------------+
- | shared | pfaults | text | | wset |
- +--------+---------+-------+-------+--------------------+
- | text | pageins | data | | peak_paged_pool |
- +--------+---------+-------+-------+--------------------+
- | lib | | stack | | paged_pool |
- +--------+---------+-------+-------+--------------------+
- | data | | | | peak_nonpaged_pool |
- +--------+---------+-------+-------+--------------------+
- | dirty | | | | nonpaged_pool |
- +--------+---------+-------+-------+--------------------+
- | | | | | pagefile |
- +--------+---------+-------+-------+--------------------+
- | | | | | peak_pagefile |
- +--------+---------+-------+-------+--------------------+
- | | | | | private |
- +--------+---------+-------+-------+--------------------+
+ +--------+---------+-------+---------+--------------------+
+ | Linux | OSX | BSD | Solaris | Windows |
+ +========+=========+=======+=========+====================+
+ | rss | rss | rss | rss | num_page_faults |
+ +--------+---------+-------+---------+--------------------+
+ | vms | vms | vms | vms | peak_wset |
+ +--------+---------+-------+---------+--------------------+
+ | shared | pfaults | text | | wset |
+ +--------+---------+-------+---------+--------------------+
+ | text | pageins | data | | peak_paged_pool |
+ +--------+---------+-------+---------+--------------------+
+ | lib | | stack | | paged_pool |
+ +--------+---------+-------+---------+--------------------+
+ | data | | | | peak_nonpaged_pool |
+ +--------+---------+-------+---------+--------------------+
+ | dirty | | | | nonpaged_pool |
+ +--------+---------+-------+---------+--------------------+
+ | | | | | pagefile |
+ +--------+---------+-------+---------+--------------------+
+ | | | | | peak_pagefile |
+ +--------+---------+-------+---------+--------------------+
+ | | | | | private |
+ +--------+---------+-------+---------+--------------------+
Windows metrics are extracted from
`PROCESS_MEMORY_COUNTERS_EX <http://msdn.microsoft.com/en-us/library/windows/desktop/ms684874(v=vs.85).aspx>`__ structure.
@@ -1287,12 +1287,14 @@ Constants
.. _const-pstatus:
.. data:: PROCFS_PATH
- The path of the /proc filesystem on Linux (defaults to "/proc"). You may want
- to re-set this in case /proc is mounted elsewhere.
+ The path of the /proc filesystem on Linux and Solaris (defaults to "/proc").
+ You may want to re-set this constant right after importing psutil in case
+ your /proc filesystem is mounted elsewhere.
- Availability: Linux
+ Availability: Linux, Solaris
.. versionadded:: 3.2.3
+ .. versionchanged:: 3.4.2 also available on Solaris.
.. _const-pstatus:
.. data:: STATUS_RUNNING
diff --git a/psutil/__init__.py b/psutil/__init__.py
index 1c36bee4..d46e034e 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -168,7 +168,7 @@ __all__ = [
]
__all__.extend(_psplatform.__extra__all__)
__author__ = "Giampaolo Rodola'"
-__version__ = "3.4.1"
+__version__ = "3.4.2"
version_info = tuple([int(num) for num in __version__.split('.')])
AF_LINK = _psplatform.AF_LINK
_TOTAL_PHYMEM = None