Skip to content

gh-150114: Log the memory usage in regrtest on macOS #150396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corona10 merged 5 commits into from
May 25, 2026
+32 −2
Merged

gh-150114: Log the memory usage in regrtest on macOS #150396

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7327561
gh-150114: Log the memory usage in regrtest on macOS
corona10 May 25, 2026
03abe46
fix for iOS
corona10 May 25, 2026
e3870ab
Merge remote-tracking branch 'upstream/main' into gh-150114-macos
corona10 May 25, 2026
f31e283
Address code review
corona10 May 25, 2026
526034a
Address code review
corona10 May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions Modules/_testcapi/mem.c
View file
Open in desktop
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