Embed vm->static_ext_inits

Author: byroot

internal/st.h

@@ -11,6 +11,9 @@ st_table *rb_st_init_existing_table_with_size(st_table *tab, const struct st_has
 st_table *rb_st_init_existing_numtable_with_size(st_table *tab, st_index_t size);
 #define st_init_existing_numtable_with_size rb_st_init_existing_numtable_with_size
 
+st_table *rb_st_init_existing_strtable_with_size(st_table *tab, st_index_t size);
+#define st_init_existing_strtable_with_size rb_st_init_existing_strtable_with_size
+
 void rb_st_free_embedded_table(st_table *tab);
 #define st_free_embedded_table rb_st_free_embedded_table
 

load.c

@@ -1139,7 +1139,7 @@ search_required(const rb_box_t *box, VALUE fname, volatile VALUE *path, feature_
     // not already a feature and not found as a dynamic library.
     if (!ft && type != loadable_ext_rb) {
         rb_vm_t *vm = GET_VM();
-        if (vm->static_ext_inits) {
+        if (vm->static_ext_inits.num_entries) {
             VALUE lookup_name = tmp;
             // Append ".so" if not already present so for example "etc" can find "etc.so".
             // We always register statically linked extensions with a ".so" extension.
@@ -1149,7 +1149,7 @@ search_required(const rb_box_t *box, VALUE fname, volatile VALUE *path, feature_
                 rb_str_cat_cstr(lookup_name, ".so");
             }
             ftptr = RSTRING_PTR(lookup_name);
-            if (st_lookup(vm->static_ext_inits, (st_data_t)ftptr, NULL)) {
+            if (st_lookup(&vm->static_ext_inits, (st_data_t)ftptr, NULL)) {
                 *path = rb_filesystem_str_new_cstr(ftptr);
                 RB_GC_GUARD(lookup_name);
                 return 's';
@@ -1215,7 +1215,7 @@ run_static_ext_init(VALUE vm_ptr, VALUE feature_value)
     st_data_t key = (st_data_t)feature;
     st_data_t init_func;
 
-    if (vm->static_ext_inits && st_delete(vm->static_ext_inits, &key, &init_func)) {
+    if (st_delete(&vm->static_ext_inits, &key, &init_func)) {
         ((void (*)(void))init_func)();
         return Qtrue;
     }
@@ -1490,19 +1490,13 @@ register_init_ext(st_data_t *key, st_data_t *value, st_data_t init, int existing
 void
 ruby_init_ext(const char *name, void (*init)(void))
 {
-    st_table *inits_table;
     rb_vm_t *vm = GET_VM();
     const rb_box_t *box = rb_loading_box();
 
     if (feature_provided((rb_box_t *)box, name, 0))
         return;
 
-    inits_table = vm->static_ext_inits;
-    if (!inits_table) {
-        inits_table = st_init_strtable();
-        vm->static_ext_inits = inits_table;
-    }
-    st_update(inits_table, (st_data_t)name, register_init_ext, (st_data_t)init);
+    st_update(&vm->static_ext_inits, (st_data_t)name, register_init_ext, (st_data_t)init);
 }
 
 /*

parser_st.c

@@ -80,6 +80,8 @@ nonempty_memcpy(void *dest, const void *src, size_t n)
 #define st_init_table_with_size rb_parser_st_init_table_with_size
 #undef st_init_existing_table_with_size
 #define st_init_existing_table_with_size rb_parser_st_init_existing_table_with_size
+#undef st_init_existing_strtable_with_size
+#define st_init_existing_strtable_with_size rb_parser_st_init_existing_strtable_with_size
 #undef st_init_existing_numtable_with_size
 #define st_init_existing_numtable_with_size rb_parser_st_init_existing_numtable_with_size
 #undef st_free_embedded_table

st.c

@@ -651,6 +651,13 @@ st_init_strtable_with_size(st_index_t size)
     return st_init_table_with_size(&type_strhash, size);
 }
 
+st_table *
+st_init_existing_strtable_with_size(st_table *tab, st_index_t size)
+{
+    return st_init_existing_table_with_size(tab, &type_strhash, size);
+}
+
+
 /* Create and return table which can hold a minimal number of strings
    whose character case is ignored.  */
 st_table *

vm.c

@@ -3393,7 +3393,7 @@ ruby_vm_destruct(rb_vm_t *vm)
             // TODO: Is this ignorable for classext->m_tbl ?
             // rb_id_table_free(RCLASS(rb_mRubyVMFrozenCore)->m_tbl);
 
-            st_free_table(vm->static_ext_inits);
+            st_free_embedded_table(&vm->static_ext_inits);
 
             rb_id_table_free_items(&vm->constant_cache);
             set_free_embedded_table(&vm->unused_block_warning_table);
@@ -4586,6 +4586,7 @@ Init_BareVM(void)
     rb_objspace_alloc();
     rb_id_table_init(&vm->negative_cme_table, 16);
     st_init_existing_numtable_with_size(&vm->overloaded_cme_table, 0);
+    st_init_existing_strtable_with_size(&vm->static_ext_inits, 0);
     set_init_embedded_numtable_with_size(&vm->unused_block_warning_table, 0);
     vm->global_hooks.type = hook_list_type_global;
 

vm_core.h

@@ -780,7 +780,7 @@ typedef struct rb_vm_struct {
     /* load */
     // For running the init function of statically linked
     // extensions when they are loaded
-    struct st_table *static_ext_inits;
+    struct st_table static_ext_inits;
 
     /* signal */
     struct {