diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-04 15:30:26 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-04 15:30:26 +0100 |
| commit | 5e07b7327f7b215e123f525e2227edc71038e222 (patch) | |
| tree | c8fc49cddbf6c867f1c54de1866b7d28ab5694a4 | |
| parent | 2ae7e106bc1ce2a07085dbe0fd426f46323d3c76 (diff) | |
| download | psutil-5e07b7327f7b215e123f525e2227edc71038e222.tar.gz | |
add test case for comparing memory_info / ex
| -rw-r--r-- | psutil/_psbsd.py | 4 | ||||
| -rw-r--r-- | psutil/_pssunos.py | 1 | ||||
| -rw-r--r-- | test/test_psutil.py | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py index 5397026f..971b2f6b 100644 --- a/psutil/_psbsd.py +++ b/psutil/_psbsd.py @@ -98,6 +98,7 @@ svmem = namedtuple( 'active', 'inactive', 'buffers', 'cached', 'shared', 'wired']) scputimes = namedtuple( 'scputimes', ['user', 'nice', 'system', 'idle', 'irq']) +pmem = namedtuple('pmem', ['rss', 'vms', 'text', 'data', 'stack']) pextmem = namedtuple('pextmem', ['rss', 'vms', 'text', 'data', 'stack']) pmmap_grouped = namedtuple( 'pmmap_grouped', 'path rss, private, ref_count, shadow_count') @@ -432,8 +433,7 @@ class Process(object): @wrap_exceptions def memory_info(self): - rss, vms = cext.proc_memory_info(self.pid)[:2] - return _common.pmem(rss, vms) + return pmem(*cext.proc_memory_info(self.pid)) @wrap_exceptions def memory_info_ex(self): diff --git a/psutil/_pssunos.py b/psutil/_pssunos.py index 74040d9a..2e75b197 100644 --- a/psutil/_pssunos.py +++ b/psutil/_pssunos.py @@ -60,6 +60,7 @@ TCP_STATUSES = { scputimes = namedtuple('scputimes', ['user', 'system', 'idle', 'iowait']) svmem = namedtuple('svmem', ['total', 'available', 'percent', 'used', 'free']) +pmem = namedtuple('pmem', ['rss', 'vms']) pextmem = namedtuple('pextmem', ['rss', 'vms']) pmmap_grouped = namedtuple('pmmap_grouped', ['path', 'rss', 'anonymous', 'locked']) diff --git a/test/test_psutil.py b/test/test_psutil.py index d29ddf15..9bd6eddf 100644 --- a/test/test_psutil.py +++ b/test/test_psutil.py @@ -1698,6 +1698,9 @@ class TestProcess(unittest.TestCase): if LINUX: self.assertGreater(memex.pss, 0) self.assertGreater(memex.pss, memex.uss) + base_mem = psutil.Process().memory_info() + self.assertEqual(memex.rss, base_mem.rss) + self.assertEqual(memex.vms, base_mem.vms) @unittest.skipIf(OPENBSD or NETBSD, "not available on this platform") def test_memory_maps(self): |