Changeset: e3577bc93042 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3577bc93042
Modified Files:
MonetDB/src/gdk/gdk_system.mx
Branch: Jun2010
Log Message:
Detect memory properly on Darwin/OSX systems
diffs (25 lines):
diff -r 89070599e2d6 -r e3577bc93042 MonetDB/src/gdk/gdk_system.mx
--- a/MonetDB/src/gdk/gdk_system.mx Tue Jun 29 14:50:44 2010 +0200
+++ b/MonetDB/src/gdk/gdk_system.mx Tue Jun 29 15:02:54 2010 +0200
@@ -372,7 +372,20 @@
# 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"
+# if defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE)
+ {
+ int mib[2] = { CTL_HW, HW_MEMSIZE };
+ unsigned int namelen = sizeof(mib) / sizeof(mib[0]);
+ uint64_t size;
+ size_t len = sizeof(size);
+
+ if (sysctl(mib, namelen, &size, &len, NULL, 0) >= 0) {
+ _MT_npages = size / _MT_pagesize;
+ }
+ }
+# else
+# error "don't know how to get the amount of physical memory for your OS"
+# endif /* sysctl */
# endif /* sysconf */
# endif /* GlobalMemoryStatus */
#endif /* GlobalMemoryStatusEx */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list