upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-07 15:54:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chg: dev: Use libuv functions to get memory available to BIND 9

Browse source 
This change uses uv_get_available_memory() if available with fallback
to uv_get_constrained_memory() with fallback to uv_get_total_memory().

Merge branch 'ondrej/use-uv_get_available_memory' into 'main'

See merge request isc-projects/bind9!9527
This commit is contained in:
Ondřej Surý 2024-09-24 13:51:55 +00:00
commit aed7f552d5
1 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/isc/meminfo.c
View file

@ -12,42 +12,18 @@
*/
#include <inttypes.h>
#include <sys/param.h>
#include <sys/types.h>
#include <unistd.h>
#if HAVE_SYS_SYSCTL_H && !defined(__linux__)
#include <sys/sysctl.h>
#endif
#include <isc/meminfo.h>
#include <isc/uv.h>
uint64_t
isc_meminfo_totalphys(void) {
#if defined(CTL_HW) && (defined(HW_PHYSMEM64) || defined(HW_MEMSIZE))
int mib[2];
mib[0] = CTL_HW;
#if defined(HW_MEMSIZE)
mib[1] = HW_MEMSIZE;
#elif defined(HW_PHYSMEM64)
mib[1] = HW_PHYSMEM64;
#endif /* if defined(HW_MEMSIZE) */
uint64_t size = 0;
size_t len = sizeof(size);
if (sysctl(mib, 2, &size, &len, NULL, 0) == 0) {
return (size);
uint64_t tmem = uv_get_total_memory();
#if UV_VERSION_HEX >= UV_VERSION(1, 29, 0)
uint64_t cmem = uv_get_constrained_memory();
if (cmem > 0 && cmem < tmem) {
return (cmem);
}
#endif /* if defined(CTL_HW) && (defined(HW_PHYSMEM64) || defined(HW_MEMSIZE)) \
* */
#if defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
long pages = sysconf(_SC_PHYS_PAGES);
long pagesize = sysconf(_SC_PAGESIZE);
if (pages < 0 || pagesize < 0) {
return (0);
}
return ((uint64_t)pages * pagesize);
#endif /* if defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE) */
return (0);
#endif /* UV_VERSION_HEX >= UV_VERSION(1, 29, 0) */
return (tmem);
}