Skip to content
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

chore(vendor): fix psutil getpagesize() for newer macos (backport #3382) #3389

Merged
merged 1 commit into from
Mar 8, 2022
Merged

chore(vendor): fix psutil getpagesize() for newer macos (backport #3382) #3389

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ddtrace/vendor/psutil/_psutil_osx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ psutil_virtual_mem(PyObject *self, PyObject *args) {
uint64_t total;
size_t len = sizeof(total);
vm_statistics_data_t vm;
int pagesize = getpagesize();
int pagesize = PAGE_SIZE;
// physical mem
mib[0] = CTL_HW;
mib[1] = HW_MEMSIZE;
Expand Down Expand Up @@ -553,7 +553,7 @@ psutil_swap_mem(PyObject *self, PyObject *args) {
size_t size;
struct xsw_usage totals;
vm_statistics_data_t vmstat;
int pagesize = getpagesize();
int pagesize = PAGE_SIZE;

mib[0] = CTL_VM;
mib[1] = VM_SWAPUSAGE;
Expand Down