Use initialize_collection() instead of enable_collection() (#119)

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 = "08cecbc080cc853383fa96f54436b8ca8026b130" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "0ededb3efad9d07d45844712aa46a8d402a8c73f" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/src/api.rs

@@ -124,8 +124,8 @@ pub extern "C" fn start_worker(tls: VMWorkerThread, worker: *mut GCWorker<OpenJD
 }
 
 #[no_mangle]
-pub extern "C" fn enable_collection(tls: VMThread) {
-    memory_manager::enable_collection(&SINGLETON, tls)
+pub extern "C" fn initialize_collection(tls: VMThread) {
+    memory_manager::initialize_collection(&SINGLETON, tls)
 }
 
 #[no_mangle]

openjdk/mmtk.h

@@ -68,7 +68,7 @@ extern void* get_finalized_object();
  * Misc
  */
 extern char* mmtk_active_barrier();
-extern void enable_collection(void *tls);
+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);

openjdk/mmtkHeap.cpp

@@ -131,7 +131,7 @@ void MMTkHeap::enable_collection() {
   // Otherwise it is possible that we schedule finalizer (during a GC) before the finalizer thread is ready.
   MMTkFinalizerThread::initialize();
 
-  ::enable_collection(0);
+  ::initialize_collection(0);
 }
 
 ////Previously pure abstract methods--