Use process_bulk() API and ThirdPartyHeapOptions (#132)

Author: qinsoon

mmtk/Cargo.toml

@@ -20,7 +20,7 @@ lazy_static = "1.1"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ad95d7797f020eaab1e608dc03b7db6a3d79839a" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "4851e7ac7e8a7bd70ce65935c4ac1ff430cab6f1" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/src/api.rs

@@ -217,6 +217,14 @@ pub extern "C" fn process(name: *const c_char, value: *const c_char) -> bool {
     )
 }
 
+#[no_mangle]
+// We trust the name/value pointer is valid.
+#[allow(clippy::not_unsafe_ptr_arg_deref)]
+pub extern "C" fn process_bulk(options: *const c_char) -> bool {
+    let options_str: &CStr = unsafe { CStr::from_ptr(options) };
+    memory_manager::process_bulk(&SINGLETON, options_str.to_str().unwrap())
+}
+
 #[no_mangle]
 pub extern "C" fn starting_heap_address() -> Address {
     memory_manager::starting_heap_address()

openjdk/mmtk.h

@@ -74,6 +74,7 @@ extern void initialize_collection(void *tls);
 extern void gc_init(size_t heap_size);
 extern bool will_never_move(void* object);
 extern bool process(char* name, char* value);
+extern bool process_bulk(char* options);
 extern void scan_region();
 extern void handle_user_collection_request(void *tls);
 

openjdk/mmtkHeap.cpp

@@ -77,6 +77,12 @@ jint MMTkHeap::initialize() {
   size_t mmtk_heap_size = heap_size;
   /*forcefully*/ //mmtk_heap_size = (1<<31) -1;
 
+  // Set options
+  if (ThirdPartyHeapOptions != NULL) {
+    bool set_options = process_bulk(strdup(ThirdPartyHeapOptions));
+    guarantee(set_options, "Failed to set MMTk options. Please check if the options are valid: %s\n", ThirdPartyHeapOptions);
+  }
+
   openjdk_gc_init(&mmtk_upcalls, mmtk_heap_size);
   // Cache the value here. It is a constant depending on the selected plan. The plan won't change from now, so value won't change.
   MMTkMutatorContext::max_non_los_default_alloc_bytes = get_max_non_los_default_alloc_bytes();