FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-150114: Log the memory usage in regrtest on macOS by corona10 · Pull Request #150396 · python/cpython · GitHub

Repository navigation

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
34 changes: 32 additions & 2 deletions Modules/_testcapi/mem.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

#include <stddef.h>

#if defined(__APPLE__)
# include <TargetConditionals.h>
// Older macOS SDKs do not define TARGET_OS_OSX
# if !defined(TARGET_OS_OSX)
# define TARGET_OS_OSX 1
# endif
# if TARGET_OS_OSX
# include <errno.h> // errno, ESRCH
# include <libproc.h> // proc_pidinfo(), PROC_PIDTASKINFO
# include <sys/proc_info.h> // struct proc_taskinfo
# endif
#endif

#ifdef __FreeBSD__
# include <fcntl.h> // O_RDONLY
# include <kvm.h> // kvm_openfiles()
Expand Down Expand Up @@ -693,7 +706,7 @@ tracemalloc_track_race(PyObject *self, PyObject *args)
}


#ifdef __FreeBSD__
#if TARGET_OS_OSX || defined(__FreeBSD__)
// Return RSS only. Per-process swap usage isn't readily available
static PyObject*
get_process_memory_usage(PyObject *self, PyObject *args)
Comment thread
vstinner marked this conversation as resolved.
Expand All @@ -703,6 +716,22 @@ get_process_memory_usage(PyObject *self, PyObject *args)
return NULL;
}
Comment thread
vstinner marked this conversation as resolved.

#if TARGET_OS_OSX
// macOS: proc_pidinfo(PROC_PIDTASKINFO).pti_resident_size
struct proc_taskinfo pti;
int ret = proc_pidinfo(pid, PROC_PIDTASKINFO, 0, &pti, sizeof(pti));
if (ret <= 0) {
if (errno == 0) {
// proc_pidinfo() can return 0 without setting errno when the
// process does not exist.
errno = ESRCH;
}
return PyErr_SetFromErrno(PyExc_OSError);
}

return PyLong_FromUnsignedLongLong(pti.pti_resident_size);
#else
// FreeBSD: kvm_getprocs(KERN_PROC_PID) and ki_rssize * page_size
long page_size = sysconf(_SC_PAGESIZE);
if (page_size <= 0) {
return PyErr_SetFromErrno(PyExc_OSError);
Expand Down Expand Up @@ -740,6 +769,7 @@ get_process_memory_usage(PyObject *self, PyObject *args)
error:
kvm_close(kd);
return NULL;
#endif
}
#endif

Expand All @@ -758,7 +788,7 @@ static PyMethodDef test_methods[] = {
{"test_pymem_setrawallocators", test_pymem_setrawallocators, METH_NOARGS},
{"test_pyobject_new", test_pyobject_new, METH_NOARGS},
{"test_pyobject_setallocators", test_pyobject_setallocators, METH_NOARGS},
#ifdef __FreeBSD__
#if TARGET_OS_OSX || defined(__FreeBSD__)
{"get_process_memory_usage", get_process_memory_usage, METH_VARARGS},
#endif

Expand Down
Loading

Back | FazBrowse Home | New Git URL