Update Julia upstream 909c57f (mmtk#60)

Author: qinsoon

.github/scripts/common.sh

@@ -10,6 +10,8 @@ export MMTK_JULIA_DIR=$BINDING_PATH
 # Make sure we have enough heap to build Julia
 export MMTK_MIN_HSIZE_G=0.5
 export MMTK_MAX_HSIZE_G=4
+# Make sure we do not get OOM killed. The Github runner has ~7G RAM.
+export JULIA_TEST_MAXRSS_MB=6500
 
 ci_run_jl_test() {
     test=$1

julia/mmtk_julia.c

@@ -10,7 +10,7 @@ edition = "2018"
 [package.metadata.julia]
 # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works.
 julia_repo = "https://github.com/mmtk/julia.git"
-julia_version = "e7e43f11687e7db62dc18e90f3ab9b24099539fd"
+julia_version = "0eeb64b0191b08b0ce7b59a66dea6139db60dbd2"
 
 [lib]
 crate-type = ["staticlib", "rlib", "dylib"]

mmtk/Cargo.toml

@@ -23,21 +23,21 @@ typedef void (*ProcessOffsetEdgeFn)(closure_pointer closure, void* slot, int off
 /**
  * Allocation
  */
-extern MMTk_Mutator bind_mutator(void *tls, int tid);
-extern void add_mutator_ref(void* mutator_ref);
-extern void destroy_mutator(MMTk_Mutator mutator);
+extern MMTk_Mutator mmtk_bind_mutator(void *tls, int tid);
+extern void mmtk_add_mutator_ref(void* mutator_ref);
+extern void mmtk_destroy_mutator(MMTk_Mutator mutator);
 
-extern void* alloc(MMTk_Mutator mutator, size_t size,
+extern void* mmtk_alloc(MMTk_Mutator mutator, size_t size,
     size_t align, size_t offset, int allocator);
 
-extern void* alloc_large(MMTk_Mutator mutator, size_t size,
+extern void* mmtk_alloc_large(MMTk_Mutator mutator, size_t size,
     size_t align, size_t offset, int allocator);    
 
-extern void post_alloc(MMTk_Mutator mutator, void* refer,
+extern void mmtk_post_alloc(MMTk_Mutator mutator, void* refer,
     size_t bytes, int allocator);
 
-extern void add_object_to_mmtk_roots(void *obj);
-extern void process_root_edges(closure_pointer c, void* slot);
+extern void mmtk_add_object_to_mmtk_roots(void *obj);
+extern void mmtk_process_root_edges(closure_pointer c, void* slot);
 
 extern void* mmtk_counted_malloc(size_t size);
 extern void* mmtk_malloc(size_t size);
@@ -50,13 +50,13 @@ extern void mmtk_free(void* addr);
 extern void* mmtk_malloc_aligned(size_t size, size_t alignment);
 extern void mmtk_free_aligned(void* addr);
 
-extern bool is_live_object(void* ref);
-extern bool is_mapped_object(void* ref);
-extern bool is_mapped_address(void* addr);
-extern void modify_check(void* ref);
-extern int object_is_managed_by_mmtk(void* addr);
-extern void runtime_panic(void);
-extern void unreachable(void);
+extern bool mmtk_is_live_object(void* ref);
+extern bool mmtk_is_mapped_object(void* ref);
+extern bool mmtk_is_mapped_address(void* addr);
+extern void mmtk_modify_check(void* ref);
+extern int mmtk_object_is_managed_by_mmtk(void* addr);
+extern void mmtk_runtime_panic(void);
+extern void mmtk_unreachable(void);
 
 extern void mmtk_set_vm_space(void* addr, size_t size);
 extern void mmtk_immortal_region_post_alloc(void* addr, size_t size);
@@ -66,26 +66,9 @@ extern void mmtk_memory_region_copy(MMTk_Mutator mutator, void* src_obj, void* s
 extern void mmtk_object_reference_write_post(MMTk_Mutator mutator, const void* src, const void* target);
 extern void mmtk_object_reference_write_slow(MMTk_Mutator mutator, const void* src, const void* target);
 extern const uint8_t MMTK_NEEDS_WRITE_BARRIER;
-extern const uint8_t NO_BARRIER;
-extern const uint8_t OBJECT_BARRIER;
+extern const uint8_t MMTK_NO_BARRIER;
+extern const uint8_t MMTK_OBJECT_BARRIER;
 extern const void* MMTK_SIDE_LOG_BIT_BASE_ADDRESS;
-/**
- * Tracing
- */
-extern void report_delayed_root_edge(MMTk_TraceLocal trace_local,
-                                     void* addr);
-
-extern bool will_not_move_in_current_collection(MMTk_TraceLocal trace_local,
-                                                void* obj);
-
-extern void process_interior_edge(MMTk_TraceLocal trace_local, void* target,
-                                  void* slot, bool root);
-
-extern void* trace_get_forwarded_referent(MMTk_TraceLocal trace_local, void* obj);
-
-extern void* trace_get_forwarded_reference(MMTk_TraceLocal trace_local, void* obj);
-
-extern void* trace_retain_referent(MMTk_TraceLocal trace_local, void* obj);
 
 /**
  * Julia-specific
@@ -122,30 +105,30 @@ typedef struct {
 /**
  * Misc
  */
-extern void gc_init(long long min_heap_size, long long max_heap_size, Julia_Upcalls *calls, long header_size);
-extern bool will_never_move(void* object);
-extern bool process(char* name, char* value);
-extern void scan_region(void);
-extern void handle_user_collection_request(void *tls, uint8_t collection);
-extern void initialize_collection(void* tls);
-extern void enable_collection(void);
-extern void disable_collection(void);
-extern void start_control_collector(void *tls);
-extern void start_worker(void *tls, void* worker, void* mmtk);
-extern void process_julia_obj(void* addr);
-extern void register_finalizer(void* obj, void* function, bool is_ptr);
-extern void run_finalizers_for_obj(void* obj);
+extern void mmtk_gc_init(uintptr_t min_heap_size, uintptr_t max_heap_size, uintptr_t n_gcthreads, Julia_Upcalls *calls, uintptr_t header_size);
+extern bool mmtk_will_never_move(void* object);
+extern bool mmtk_process(char* name, char* value);
+extern void mmtk_scan_region(void);
+extern void mmtk_handle_user_collection_request(void *tls, uint8_t collection);
+extern void mmtk_initialize_collection(void* tls);
+extern void mmtk_enable_collection(void);
+extern void mmtk_disable_collection(void);
+extern void mmtk_start_control_collector(void *tls);
+extern void mmtk_start_worker(void *tls, void* worker, void* mmtk);
+extern void mmtk_process_julia_obj(void* addr);
+extern void mmtk_register_finalizer(void* obj, void* function, bool is_ptr);
+extern void mmtk_run_finalizers_for_obj(void* obj);
 extern void mmtk_run_finalizers(bool at_exit);
 extern void mmtk_gc_poll(void *tls);
 
 /**
  * VM Accounting
  */
-extern size_t free_bytes(void);
-extern size_t total_bytes(void);
-extern size_t used_bytes(void);
-extern void* starting_heap_address(void);
-extern void* last_heap_address(void);
+extern size_t mmtk_free_bytes(void);
+extern size_t mmtk_total_bytes(void);
+extern size_t mmtk_used_bytes(void);
+extern void* mmtk_starting_heap_address(void);
+extern void* mmtk_last_heap_address(void);
 
 /**
  * Reference Processing
@@ -154,8 +137,8 @@ extern void mmtk_add_weak_candidate(void* ref);
 extern void mmtk_add_soft_candidate(void* ref);
 extern void mmtk_add_phantom_candidate(void* ref);
 
-extern void harness_begin(void *tls);
-extern void harness_end(void);
+extern void mmtk_harness_begin(void *tls);
+extern void mmtk_harness_end(void);
 
 #ifdef __cplusplus
 }

mmtk/api/mmtk.h

@@ -13,8 +13,8 @@ void* get_mutator_from_ref(void* mutator) {
     return mutator;
 }
 
-extern void start_spawned_worker_thread(void*, void*);
-extern void start_spawned_controller_thread(void*, void*);
+extern void mmtk_start_spawned_worker_thread(void*, void*);
+extern void mmtk_start_spawned_controller_thread(void*, void*);
 
 struct thread_args {
     void* tls;
@@ -30,15 +30,15 @@ void *fn_spawn_worker_thread(void* args) {
     struct thread_args *ta = (struct thread_args *)  args;
     void* tls = (*ta).tls;
     void* ctx = (*ta).ctx;
-    start_spawned_worker_thread(tls, ctx);
+    mmtk_start_spawned_worker_thread(tls, ctx);
     return NULL;
 }
 
 void *fn_spawn_controller_thread(void* args) {
     struct thread_args *ta = (struct thread_args *)  args;
     void* tls = (*ta).tls;
     void* ctx = (*ta).ctx;
-    start_spawned_controller_thread(tls, ctx);
+    mmtk_start_spawned_controller_thread(tls, ctx);
     return NULL;
 }