diff options
| author | Carlo Marcelo Arenas Belón <carenas@gmail.com> | 2025-07-07 09:45:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-07 10:04:32 -0700 |
| commit | 781c1cf5712f1768278f7f926f39ebad3be4aae0 (patch) | |
| tree | 0925d17935ccaa3a5d7d74a99ef4885337739011 /builtin/gc.c | |
| parent | builtin/gc: correct physical memory detection for OpenBSD / NetBSD (diff) | |
| download | git-781c1cf5712f1768278f7f926f39ebad3be4aae0.tar.gz git-781c1cf5712f1768278f7f926f39ebad3be4aae0.zip | |
builtin/gc: correct total_ram calculation with HAVE_BSD_SYSCTL
The calls to sysctl() assume a 64-bit memory size for the variable
holding the value, but the actual size depends on the key name and
platform, at least for HW_PHYSMEM.
Detect any mismatched reads, and retry with a shorter variable
when needed.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | builtin/gc.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 7dc94f243d..6880f5b13d 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -517,7 +517,7 @@ static uint64_t total_ram(void) return total; } #elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM) || defined(HW_PHYSMEM64)) - int64_t physical_memory; + uint64_t physical_memory; int mib[2]; size_t length; @@ -529,9 +529,16 @@ static uint64_t total_ram(void) # else mib[1] = HW_PHYSMEM; # endif - length = sizeof(int64_t); - if (!sysctl(mib, 2, &physical_memory, &length, NULL, 0)) + length = sizeof(physical_memory); + if (!sysctl(mib, 2, &physical_memory, &length, NULL, 0)) { + if (length == 4) { + uint32_t mem; + + if (!sysctl(mib, 2, &mem, &length, NULL, 0)) + physical_memory = mem; + } return physical_memory; + } #elif defined(GIT_WINDOWS_NATIVE) MEMORYSTATUSEX memInfo; |