Merge pull request ruby#61 from dugiahuy/support-macos

wks · web-flow · commit d64eda979a77 · 2024-04-11T21:38:48.000+08:00
Support MacOS for running MMTk Ruby binding
diff --git a/mmtk_support.c b/mmtk_support.c
@@ -16,6 +16,10 @@
 #include "vm_sync.h"
 #include "stdatomic.h"
 
+#ifdef __APPLE__
+#include <sys/sysctl.h>
+#endif
+
 #ifdef __GNUC__
 #define PREFETCH(addr, write_p) __builtin_prefetch(addr, write_p)
 #define EXPECT(expr, val) __builtin_expect(expr, val)
@@ -218,6 +222,17 @@ rb_mmtk_system_physical_memory(void)
         rb_bug("failed to get system physical memory size");
     }
     return (size_t) physical_pages * (size_t) page_size;
+#elif defined(__APPLE__)
+    int mib[2];
+    mib[0] = CTL_HW;
+    mib[1] = HW_MEMSIZE; // total physical memory
+    int64_t physical_memory;
+    size_t length = sizeof(int64_t);
+    if (sysctl(mib, 2, &physical_memory, &length, NULL, 0) == -1)
+    {
+        rb_bug("failed to get system physical memory size");
+    }
+    return (size_t) physical_memory;
 #else
 #error no implementation of rb_mmtk_system_physical_memory on this platform
 #endif
diff --git a/tool/m4/mmtk_ruby.m4 b/tool/m4/mmtk_ruby.m4
@@ -1,7 +1,7 @@
 dnl -*- Autoconf -*-
 AC_DEFUN([MMTK_RUBY], [
 
-[MMTK_RUBY_SO_NAME=libmmtk_ruby.so]
+[MMTK_RUBY_SO_NAME=libmmtk_ruby.$SOEXT]
 
 AC_ARG_WITH(mmtk-ruby,
     AS_HELP_STRING([--with-mmtk-ruby=DIR],
@@ -31,7 +31,7 @@ AS_IF([test -n "$with_mmtk_ruby"], [
         AC_MSG_NOTICE([User specified the path to $MMTK_RUBY_SO_NAME: $with_mmtk_ruby_so])
         mmtk_ruby_so_basename=$(basename $with_mmtk_ruby_so)
         AS_IF([test "x$mmtk_ruby_so_basename" != "x$MMTK_RUBY_SO_NAME"],[
-            AC_MSG_ERROR([The base name must be $MMTK_RUBY_SO_NAME  Found: $mmtk_ruby_so_basename])
+            AC_MSG_ERROR([The base name must be $MMTK_RUBY_SO_NAME. Found: $mmtk_ruby_so_basename])
         ])
         mmtk_ruby_so_path="$with_mmtk_ruby_so"
         mmtk_ruby_build_suggestion="Please build it first"
