optimize object pinning in ast.c

Author: d-netto

src/ast.c

@@ -778,11 +778,10 @@ static value_t julia_to_list2_noalloc(fl_context_t *fl_ctx, jl_value_t *a, jl_va
     return l;
 }
 
-static value_t julia_to_scm_(fl_context_t *fl_ctx, jl_value_t *v, int check_valid)
+static value_t julia_to_scm__(fl_context_t *fl_ctx, jl_value_t *v, int check_valid)
 {
     // The following code will take internal pointers to v's fields. We need to make sure
     // that v will not be moved by GC.
-    OBJ_PIN(v);
     value_t retval;
     if (julia_to_scm_noalloc1(fl_ctx, v, &retval))
         return retval;
@@ -840,6 +839,14 @@ static value_t julia_to_scm_(fl_context_t *fl_ctx, jl_value_t *v, int check_vali
     return julia_to_scm_noalloc2(fl_ctx, v, check_valid);
 }
 
+static value_t julia_to_scm_(fl_context_t *fl_ctx, jl_value_t *v, int check_valid)
+{
+    arraylist_push(&objects_pinned_by_compiler_frontend, v);
+    value_t scm_v = julia_to_scm__(fl_ctx, v, check_valid);
+    arraylist_pop(&objects_pinned_by_compiler_frontend);
+    return scm_v;
+}
+
 // Parse `text` starting at 0-based `offset` and attributing the content to
 // `filename`. Return an svec of (parsed_expr, final_offset)
 JL_DLLEXPORT jl_value_t *jl_fl_parse(const char *text, size_t text_len,

src/engine.cpp

@@ -64,15 +64,15 @@ jl_code_instance_t *jl_engine_reserve(jl_method_instance_t *m, jl_value_t *owner
     auto tid = jl_atomic_load_relaxed(&ct->tid);
     if (([tid, m, owner, ci] () -> bool { // necessary scope block / lambda for unique_lock
             jl_unique_gcsafe_lock lock(engine_lock);
-            arraylist_push(&objects_pinned_by_inference_engine, owner);
+            arraylist_push(&objects_pinned_by_compiler_frontend, owner);
             InferKey key{m, owner};
             if ((signed)Awaiting.size() < tid + 1)
                 Awaiting.resize(tid + 1);
             while (1) {
                 auto record = Reservations.find(key);
                 if (record == Reservations.end()) {
                     Reservations[key] = ReservationInfo{tid, ci};
-                    arraylist_pop(&objects_pinned_by_inference_engine);
+                    arraylist_pop(&objects_pinned_by_compiler_frontend);
                     return false;
                 }
                 // before waiting, need to run deadlock/cycle detection
@@ -81,7 +81,7 @@ jl_code_instance_t *jl_engine_reserve(jl_method_instance_t *m, jl_value_t *owner
                 auto wait_tid = record->second.tid;
                 while (1) {
                     if (wait_tid == tid) {
-                        arraylist_pop(&objects_pinned_by_inference_engine);
+                        arraylist_pop(&objects_pinned_by_compiler_frontend);
                         return true;
                     }
                     if ((signed)Awaiting.size() <= wait_tid)
@@ -99,7 +99,7 @@ jl_code_instance_t *jl_engine_reserve(jl_method_instance_t *m, jl_value_t *owner
                 lock.wait(engine_wait);
                 Awaiting[tid] = InferKey{};
             }
-            arraylist_pop(&objects_pinned_by_inference_engine);
+            arraylist_pop(&objects_pinned_by_compiler_frontend);
         })())
         ct->ptls->engine_nqueued--;
     JL_GC_POP();

src/gc-common.c

@@ -687,7 +687,7 @@ JL_DLLEXPORT int jl_gc_enable(int on)
 // MISC
 // =========================================================================== //
 
-arraylist_t objects_pinned_by_inference_engine;
+arraylist_t objects_pinned_by_compiler_frontend;
 
 JL_DLLEXPORT jl_weakref_t *jl_gc_new_weakref(jl_value_t *value)
 {

src/gc-mmtk.c

@@ -74,7 +74,7 @@ void jl_gc_init(void) {
 
     jl_set_check_alive_type(mmtk_is_reachable_object);
 
-    arraylist_new(&objects_pinned_by_inference_engine, 0);
+    arraylist_new(&objects_pinned_by_compiler_frontend, 0);
     arraylist_new(&to_finalize, 0);
     arraylist_new(&finalizer_list_marked, 0);
     gc_num.interval = default_collect_interval;
@@ -249,18 +249,18 @@ JL_DLLEXPORT void jl_gc_collect(jl_gc_collection_t collection) {
     // print_fragmentation();
 }
 
-void gc_pin_objects_from_inference_engine(arraylist_t *objects_pinned_by_call)
+void gc_pin_objects_from_compiler_frontend(arraylist_t *objects_pinned_by_call)
 {
-    for (size_t i = 0; i < objects_pinned_by_inference_engine.len; i++) {
-        void *obj = objects_pinned_by_inference_engine.items[i];
+    for (size_t i = 0; i < objects_pinned_by_compiler_frontend.len; i++) {
+        void *obj = objects_pinned_by_compiler_frontend.items[i];
         unsigned char got_pinned = mmtk_pin_object(obj);
         if (got_pinned) {
             arraylist_push(objects_pinned_by_call, obj);
         }
     }
 }
 
-void gc_unpin_objects_from_inference_engine(arraylist_t *objects_pinned_by_call)
+void gc_unpin_objects_from_compiler_frontend(arraylist_t *objects_pinned_by_call)
 {
     for (size_t i = 0; i < objects_pinned_by_call->len; i++) {
         void *obj = objects_pinned_by_call->items[i];
@@ -332,9 +332,9 @@ JL_DLLEXPORT void jl_gc_prepare_to_collect(void)
 #ifndef __clang_gcanalyzer__
         arraylist_t objects_pinned_by_call;
         arraylist_new(&objects_pinned_by_call, 0);
-        gc_pin_objects_from_inference_engine(&objects_pinned_by_call);
+        gc_pin_objects_from_compiler_frontend(&objects_pinned_by_call);
         mmtk_block_thread_for_gc();
-        gc_unpin_objects_from_inference_engine(&objects_pinned_by_call);
+        gc_unpin_objects_from_compiler_frontend(&objects_pinned_by_call);
         arraylist_free(&objects_pinned_by_call);
 #endif
         JL_UNLOCK_NOGC(&finalizers_lock);

src/julia.h

@@ -1346,7 +1346,7 @@ JL_DLLEXPORT JL_CONST_FUNC jl_gcframe_t **(jl_get_pgcstack)(void) JL_GLOBALLY_RO
 
 // object pinning  ------------------------------------------------------------
 
-extern arraylist_t objects_pinned_by_inference_engine;
+extern arraylist_t objects_pinned_by_compiler_frontend;
 typedef bool (*check_alive_fn_type)(void *);
 JL_DLLEXPORT void jl_set_check_alive_type(check_alive_fn_type fn);
 JL_DLLEXPORT void jl_log_pinning_event(void *pinned_object, const char *filename, int lineno);