diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2018-10-16 19:57:53 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2018-10-16 19:57:53 +0200 |
| commit | 8c414c48d9db0f32194d8ac31ac7654e4483e024 (patch) | |
| tree | 752ab5503acf270ef01b071922c0771a29b39643 | |
| parent | 63aa2e7784de76ab39de8c5235a2333b4fb5c51b (diff) | |
| download | psutil-8c414c48d9db0f32194d8ac31ac7654e4483e024.tar.gz | |
travis / osx: set py 3.6
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | psutil/_psutil_osx.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 84c340f4..fdab64f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: env: PYVER=py27 - language: generic os: osx - env: PYVER=py37 + env: PYVER=py36 # pypy # - python: pypy # - python: pypy3 diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c index b75c78b2..0db93fce 100644 --- a/psutil/_psutil_osx.c +++ b/psutil/_psutil_osx.c @@ -713,10 +713,10 @@ psutil_virtual_mem(PyObject *self, PyObject *args) { return Py_BuildValue( "KKKKK", total, - (unsigned long long) vm.active_count * pagesize, - (unsigned long long) vm.inactive_count * pagesize, - (unsigned long long) vm.wire_count * pagesize, - // this is how vm_stat cmd does it + (unsigned long long) vm.active_count * pagesize, // active + (unsigned long long) vm.inactive_count * pagesize, // inactive + (unsigned long long) vm.wire_count * pagesize, // wired + // free mem; this is how vm_stat cmd does it (unsigned long long) (vm.free_count - vm.speculative_count) * pagesize ); } |