Changeset: 1b3bae80cf70 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b3bae80cf70
Modified Files:
gdk/gdk_utils.mx
Branch: Apr2011
Log Message:
memory: check using sysctl before sysconf for consistency
diffs (25 lines):
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -497,10 +497,7 @@
_MT_npages = memStat.dwTotalPhys / _MT_pagesize;
}
# else
-# if defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)
- _MT_npages = sysconf(_SC_PHYS_PAGES);
-# else
-# if defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE)
+# if defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE)
{
uint64_t size;
size_t len = sizeof(size);
@@ -508,6 +505,9 @@
sysctlbyname("hw.memsize", &size, &len, NULL, 0);
_MT_npages = size / _MT_pagesize;
}
+# else
+# if defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)
+ _MT_npages = sysconf(_SC_PHYS_PAGES);
# else
# error "don't know how to get the amount of physical memory for your OS"
# endif /* sysctl */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
