From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 1 Feb 2014 01:43:24 +0000 (-0600)
Subject: compress_parallel.c:  Determine physical memory on OS X
X-Git-Tag: v1.6.2~32
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=7d3c6d1a380bbd9e9074dce19b65bb5ac0ae4675

compress_parallel.c:  Determine physical memory on OS X
---

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 <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_SYSCTL_H
+#  include <sys/sysctl.h>
+#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: