diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-12-17 18:59:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-17 18:59:13 +0100 |
| commit | 6bdde37049ba9fae31ccf83620468f77a6b9f396 (patch) | |
| tree | 33875d40066b6b48b5ed5161d230288d968f6cc1 /psutil/_psbsd.py | |
| parent | c39fef497f0c2c963a9db03ef80cdb156f64a425 (diff) | |
| download | psutil-6bdde37049ba9fae31ccf83620468f77a6b9f396.tar.gz | |
[macOS, UNIX] prefer _SC_PAGESIZE over (partially) deprecated getpagesize() (#1891)
Add a reusable `psutil_getpagesize()` utility common to all UNIXes.
Related to #1885 (`getpagesize()` is deprecated on recent macOS, POSIX.1-2001 and possibly other UNIXes).
The problem emerged on macOS but `getpagesize()` is also used in FreeBSD, NetBSD, OpenBSD and AIX, so it makes sense to do this in one place only, similarly to Windows which also provide a `psutil_getpagesize()` utility.
Follow cPython's `mmapmodule.c` and `resourcemodule.c` lead and rely on `sysconf(_SC_PAGESIZE)` instead, but leave `getpagesize()` in place as last resort/attempt for systems where it's not deprecated and/or they still legitimately rely on it.
Also provide a python wrapper so we can test the return value of this C function against Python's stdlib modules.
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
Diffstat (limited to 'psutil/_psbsd.py')
| -rw-r--r-- | psutil/_psbsd.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py index f0a0c144..764463e9 100644 --- a/psutil/_psbsd.py +++ b/psutil/_psbsd.py @@ -98,10 +98,7 @@ TCP_STATUSES = { cext.PSUTIL_CONN_NONE: _common.CONN_NONE, } -if NETBSD: - PAGESIZE = os.sysconf("SC_PAGESIZE") -else: - PAGESIZE = os.sysconf("SC_PAGE_SIZE") +PAGESIZE = cext_posix.getpagesize() AF_LINK = cext_posix.AF_LINK HAS_PER_CPU_TIMES = hasattr(cext, "per_cpu_times") |