From 7d3c6d1a380bbd9e9074dce19b65bb5ac0ae4675 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 31 Jan 2014 19:43:24 -0600 Subject: [PATCH] compress_parallel.c: Determine physical memory on OS X --- configure.ac | 1 + src/compress_parallel.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 198fa296..00cbfb36 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,7 @@ AC_CHECK_HEADERS([alloca.h \ sys/endian.h \ sys/file.h \ sys/param.h \ + sys/sysctl.h \ sys/times.h \ time.h \ utime.h]) diff --git a/src/compress_parallel.c b/src/compress_parallel.c index 376e59d6..eeb9f6f2 100644 --- a/src/compress_parallel.c +++ b/src/compress_parallel.c @@ -43,6 +43,9 @@ #include #include #include +#ifdef HAVE_SYS_SYSCTL_H +# include +#endif struct message_queue { struct list_head list; @@ -116,12 +119,19 @@ get_avail_memory(void) if (phys_bytes == 0) goto default_size; return phys_bytes; -#else +#elif defined(_SC_PAGESIZE) && defined(_SC_PHYS_PAGES) long page_size = sysconf(_SC_PAGESIZE); long num_pages = sysconf(_SC_PHYS_PAGES); if (page_size <= 0 || num_pages <= 0) goto default_size; return ((u64)page_size * (u64)num_pages); +#else + int mib[2] = {CTL_HW, HW_MEMSIZE}; + u64 memsize; + size_t len = sizeof(memsize); + if (sysctl(mib, ARRAY_LEN(mib), &memsize, &len, NULL, 0) < 0 || len != 8) + goto default_size; + return memsize; #endif default_size: -- 2.43.0