admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bs/total-ram-bsd'

Browse Source 
Update total_ram() functrion on BSD variants.

* bs/total-ram-bsd:
  builtin/gc: correct physical memory detection for OpenBSD / NetBSD
This commit is contained in:
Junio C Hamano
2025-06-03 08:55:23 -07:00
parent 86c32bbee8 35c1d592cd
commit d9a1e51c76
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/gc.c
View File

@@ -516,7 +516,7 @@ static uint64_t total_ram(void)
total *= (uint64_t)si.mem_unit; total *= (uint64_t)si.mem_unit;
return total; return total;
} }
#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM)) #elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM) || defined(HW_PHYSMEM64))
int64_t physical_memory; int64_t physical_memory;
int mib[2]; int mib[2];
size_t length; size_t length;
@@ -524,6 +524,8 @@ static uint64_t total_ram(void)
mib[0] = CTL_HW; mib[0] = CTL_HW;
# if defined(HW_MEMSIZE) # if defined(HW_MEMSIZE)
mib[1] = HW_MEMSIZE; mib[1] = HW_MEMSIZE;
# elif defined(HW_PHYSMEM64)
mib[1] = HW_PHYSMEM64;
# else # else
mib[1] = HW_PHYSMEM; mib[1] = HW_PHYSMEM;
# endif # endif