diff options
Diffstat (limited to 'load.c')
| -rw-r--r-- | load.c | 474 |
1 files changed, 256 insertions, 218 deletions
@@ -5,8 +5,10 @@ #include "dln.h" #include "eval_intern.h" #include "internal.h" +#include "internal/box.h" #include "internal/dir.h" #include "internal/error.h" +#include "internal/eval.h" #include "internal/file.h" #include "internal/hash.h" #include "internal/load.h" @@ -19,23 +21,12 @@ #include "ruby/encoding.h" #include "ruby/util.h" #include "ractor_core.h" - -static VALUE ruby_dln_libmap; +#include "vm_core.h" #define IS_RBEXT(e) (strcmp((e), ".rb") == 0) #define IS_SOEXT(e) (strcmp((e), ".so") == 0 || strcmp((e), ".o") == 0) #define IS_DLEXT(e) (strcmp((e), DLEXT) == 0) -#if SIZEOF_VALUE <= SIZEOF_LONG -# define SVALUE2NUM(x) LONG2NUM((long)(x)) -# define NUM2SVALUE(x) (SIGNED_VALUE)NUM2LONG(x) -#elif SIZEOF_VALUE <= SIZEOF_LONG_LONG -# define SVALUE2NUM(x) LL2NUM((LONG_LONG)(x)) -# define NUM2SVALUE(x) (SIGNED_VALUE)NUM2LL(x) -#else -# error Need integer for VALUE -#endif - enum { loadable_ext_rb = (0+ /* .rb extension is the first in both tables */ 1) /* offset by rb_find_file_ext() */ @@ -64,10 +55,11 @@ enum expand_type { string objects in $LOAD_PATH are frozen. */ static void -rb_construct_expanded_load_path(rb_vm_t *vm, enum expand_type type, int *has_relative, int *has_non_cache) +rb_construct_expanded_load_path(rb_box_t *box, enum expand_type type, int *has_relative, int *has_non_cache) { - VALUE load_path = vm->load_path; - VALUE expanded_load_path = vm->expanded_load_path; + VALUE load_path = box->load_path; + VALUE expanded_load_path = box->expanded_load_path; + VALUE snapshot; VALUE ary; long i; @@ -106,108 +98,90 @@ rb_construct_expanded_load_path(rb_vm_t *vm, enum expand_type type, int *has_rel rb_ary_push(ary, rb_fstring(expanded_path)); } rb_ary_freeze(ary); - vm->expanded_load_path = ary; - rb_ary_replace(vm->load_path_snapshot, vm->load_path); + box->expanded_load_path = ary; + snapshot = box->load_path_snapshot; + load_path = box->load_path; + rb_ary_replace(snapshot, load_path); } static VALUE -get_expanded_load_path(rb_vm_t *vm) +get_expanded_load_path(rb_box_t *box) { + VALUE check_cache; const VALUE non_cache = Qtrue; + const VALUE load_path_snapshot = box->load_path_snapshot; + const VALUE load_path = box->load_path; - if (!rb_ary_shared_with_p(vm->load_path_snapshot, vm->load_path)) { + if (!rb_ary_shared_with_p(load_path_snapshot, load_path)) { /* The load path was modified. Rebuild the expanded load path. */ int has_relative = 0, has_non_cache = 0; - rb_construct_expanded_load_path(vm, EXPAND_ALL, &has_relative, &has_non_cache); + rb_construct_expanded_load_path(box, EXPAND_ALL, &has_relative, &has_non_cache); if (has_relative) { - vm->load_path_check_cache = rb_dir_getwd_ospath(); + box->load_path_check_cache = rb_dir_getwd_ospath(); } else if (has_non_cache) { /* Non string object. */ - vm->load_path_check_cache = non_cache; + box->load_path_check_cache = non_cache; } else { - vm->load_path_check_cache = 0; + box->load_path_check_cache = 0; } } - else if (vm->load_path_check_cache == non_cache) { + else if ((check_cache = box->load_path_check_cache) == non_cache) { int has_relative = 1, has_non_cache = 1; /* Expand only non-cacheable objects. */ - rb_construct_expanded_load_path(vm, EXPAND_NON_CACHE, + rb_construct_expanded_load_path(box, EXPAND_NON_CACHE, &has_relative, &has_non_cache); } - else if (vm->load_path_check_cache) { + else if (check_cache) { int has_relative = 1, has_non_cache = 1; VALUE cwd = rb_dir_getwd_ospath(); - if (!rb_str_equal(vm->load_path_check_cache, cwd)) { + if (!rb_str_equal(check_cache, cwd)) { /* Current working directory or filesystem encoding was changed. Expand relative load path and non-cacheable objects again. */ - vm->load_path_check_cache = cwd; - rb_construct_expanded_load_path(vm, EXPAND_RELATIVE, + box->load_path_check_cache = cwd; + rb_construct_expanded_load_path(box, EXPAND_RELATIVE, &has_relative, &has_non_cache); } else { /* Expand only tilde (User HOME) and non-cacheable objects. */ - rb_construct_expanded_load_path(vm, EXPAND_HOME, + rb_construct_expanded_load_path(box, EXPAND_HOME, &has_relative, &has_non_cache); } } - return vm->expanded_load_path; + return box->expanded_load_path; } VALUE rb_get_expanded_load_path(void) { - return get_expanded_load_path(GET_VM()); -} - -static VALUE -load_path_getter(ID id, VALUE * p) -{ - rb_vm_t *vm = (void *)p; - return vm->load_path; + return get_expanded_load_path((rb_box_t *)rb_loading_box()); } static VALUE -get_loaded_features(rb_vm_t *vm) +load_path_getter(ID _x, VALUE * _y) { - return vm->loaded_features; -} - -static VALUE -get_loaded_features_realpaths(rb_vm_t *vm) -{ - return vm->loaded_features_realpaths; -} - -static VALUE -get_loaded_features_realpath_map(rb_vm_t *vm) -{ - return vm->loaded_features_realpath_map; + return rb_loading_box()->load_path; } static VALUE get_LOADED_FEATURES(ID _x, VALUE *_y) { - return get_loaded_features(GET_VM()); + return rb_loading_box()->loaded_features; } static void -reset_loaded_features_snapshot(rb_vm_t *vm) +reset_loaded_features_snapshot(const rb_box_t *box) { - rb_ary_replace(vm->loaded_features_snapshot, vm->loaded_features); + VALUE snapshot = box->loaded_features_snapshot; + VALUE loaded_features = box->loaded_features; + rb_ary_replace(snapshot, loaded_features); } static struct st_table * -get_loaded_features_index_raw(rb_vm_t *vm) +get_loaded_features_index_raw(const rb_box_t *box) { - return vm->loaded_features_index; -} - -static st_table * -get_loading_table(rb_vm_t *vm) -{ - return vm->loading_table; + return box->loaded_features_index; } static st_data_t @@ -228,7 +202,7 @@ is_rbext_path(VALUE feature_path) typedef rb_darray(long) feature_indexes_t; struct features_index_add_single_args { - rb_vm_t *vm; + const rb_box_t *box; VALUE offset; bool rb; }; @@ -237,7 +211,7 @@ static int features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t raw_args, int existing) { struct features_index_add_single_args *args = (struct features_index_add_single_args *)raw_args; - rb_vm_t *vm = args->vm; + const rb_box_t *box = args->box; VALUE offset = args->offset; bool rb = args->rb; @@ -245,7 +219,7 @@ features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t r VALUE this_feature_index = *value; if (FIXNUM_P(this_feature_index)) { - VALUE loaded_features = get_loaded_features(vm); + VALUE loaded_features = box->loaded_features; VALUE this_feature_path = RARRAY_AREF(loaded_features, FIX2LONG(this_feature_index)); feature_indexes_t feature_indexes; @@ -265,7 +239,7 @@ features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t r long pos = -1; if (rb) { - VALUE loaded_features = get_loaded_features(vm); + VALUE loaded_features = box->loaded_features; for (size_t i = 0; i < rb_darray_size(feature_indexes); ++i) { long idx = rb_darray_get(feature_indexes, i); VALUE this_feature_path = RARRAY_AREF(loaded_features, idx); @@ -284,7 +258,7 @@ features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t r if (pos >= 0) { long *ptr = rb_darray_data_ptr(feature_indexes); long len = rb_darray_size(feature_indexes); - MEMMOVE(ptr + pos, ptr + pos + 1, long, len - pos - 1); + MEMMOVE(ptr + pos + 1, ptr + pos, long, len - pos - 1); ptr[pos] = FIX2LONG(offset); } } @@ -297,7 +271,7 @@ features_index_add_single_callback(st_data_t *key, st_data_t *value, st_data_t r } static void -features_index_add_single(rb_vm_t *vm, const char* str, size_t len, VALUE offset, bool rb) +features_index_add_single(const rb_box_t *box, const char* str, size_t len, VALUE offset, bool rb) { struct st_table *features_index; st_data_t short_feature_key; @@ -305,10 +279,10 @@ features_index_add_single(rb_vm_t *vm, const char* str, size_t len, VALUE offset Check_Type(offset, T_FIXNUM); short_feature_key = feature_key(str, len); - features_index = get_loaded_features_index_raw(vm); + features_index = get_loaded_features_index_raw(box); struct features_index_add_single_args args = { - .vm = vm, + .box = box, .offset = offset, .rb = rb, }; @@ -325,8 +299,10 @@ features_index_add_single(rb_vm_t *vm, const char* str, size_t len, VALUE offset relies on for its fast lookup. */ static void -features_index_add(rb_vm_t *vm, VALUE feature, VALUE offset) +features_index_add(const rb_box_t *box, VALUE feature, VALUE offset) { + RUBY_ASSERT(rb_ractor_main_p()); + const char *feature_str, *feature_end, *ext, *p; bool rb = false; @@ -351,14 +327,14 @@ features_index_add(rb_vm_t *vm, VALUE feature, VALUE offset) if (p < feature_str) break; /* Now *p == '/'. We reach this point for every '/' in `feature`. */ - features_index_add_single(vm, p + 1, feature_end - p - 1, offset, false); + features_index_add_single(box, p + 1, feature_end - p - 1, offset, false); if (ext) { - features_index_add_single(vm, p + 1, ext - p - 1, offset, rb); + features_index_add_single(box, p + 1, ext - p - 1, offset, rb); } } - features_index_add_single(vm, feature_str, feature_end - feature_str, offset, false); + features_index_add_single(box, feature_str, feature_end - feature_str, offset, false); if (ext) { - features_index_add_single(vm, feature_str, ext - feature_str, offset, rb); + features_index_add_single(box, feature_str, ext - feature_str, offset, rb); } } @@ -372,30 +348,28 @@ loaded_features_index_clear_i(st_data_t key, st_data_t val, st_data_t arg) return ST_DELETE; } -void -rb_free_loaded_features_index(rb_vm_t *vm) -{ - st_foreach(vm->loaded_features_index, loaded_features_index_clear_i, 0); - st_free_table(vm->loaded_features_index); -} - static st_table * -get_loaded_features_index(rb_vm_t *vm) +get_loaded_features_index(const rb_box_t *box) { - VALUE features; int i; + VALUE features = box->loaded_features; + const VALUE snapshot = box->loaded_features_snapshot; - if (!rb_ary_shared_with_p(vm->loaded_features_snapshot, vm->loaded_features)) { + if (!rb_ary_shared_with_p(snapshot, features)) { /* The sharing was broken; something (other than us in rb_provide_feature()) modified loaded_features. Rebuild the index. */ - st_foreach(vm->loaded_features_index, loaded_features_index_clear_i, 0); + st_foreach(box->loaded_features_index, loaded_features_index_clear_i, 0); - VALUE realpaths = vm->loaded_features_realpaths; - VALUE realpath_map = vm->loaded_features_realpath_map; + VALUE realpaths = box->loaded_features_realpaths; + VALUE realpath_map = box->loaded_features_realpath_map; VALUE previous_realpath_map = rb_hash_dup(realpath_map); rb_hash_clear(realpaths); rb_hash_clear(realpath_map); - features = vm->loaded_features; + + /* We have to make a copy of features here because the StringValue call + * below could call a Ruby method, which could modify $LOADED_FEATURES + * and cause it to be corrupt. */ + features = rb_ary_resurrect(features); for (i = 0; i < RARRAY_LEN(features); i++) { VALUE entry, as_str; as_str = entry = rb_ary_entry(features, i); @@ -403,11 +377,15 @@ get_loaded_features_index(rb_vm_t *vm) as_str = rb_fstring(as_str); if (as_str != entry) rb_ary_store(features, i, as_str); - features_index_add(vm, as_str, INT2FIX(i)); + features_index_add(box, as_str, INT2FIX(i)); + } + /* The user modified $LOADED_FEATURES, so we should restore the changes. */ + if (!rb_ary_shared_with_p(features, box->loaded_features)) { + rb_ary_replace(box->loaded_features, features); } - reset_loaded_features_snapshot(vm); + reset_loaded_features_snapshot(box); - features = rb_ary_dup(vm->loaded_features_snapshot); + features = box->loaded_features_snapshot; long j = RARRAY_LEN(features); for (i = 0; i < j; i++) { VALUE as_str = rb_ary_entry(features, i); @@ -421,7 +399,7 @@ get_loaded_features_index(rb_vm_t *vm) rb_hash_aset(realpath_map, as_str, realpath); } } - return vm->loaded_features_index; + return box->loaded_features_index; } /* This searches `load_path` for a value such that @@ -506,7 +484,7 @@ loaded_feature_path_i(st_data_t v, st_data_t b, st_data_t f) * 'u': unsuffixed */ static int -rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expanded, const char **fn) +rb_feature_p(const rb_box_t *box, const char *feature, const char *ext, int rb, int expanded, const char **fn) { VALUE features, this_feature_index = Qnil, v, p, load_path = 0; const char *f, *e; @@ -527,8 +505,8 @@ rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expa elen = 0; type = 0; } - features = get_loaded_features(vm); - features_index = get_loaded_features_index(vm); + features = box->loaded_features; + features_index = get_loaded_features_index(box); key = feature_key(feature, strlen(feature)); /* We search `features` for an entry such that either @@ -570,12 +548,13 @@ rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expa index = rb_darray_get(feature_indexes, i); } + if (index >= RARRAY_LEN(features)) continue; v = RARRAY_AREF(features, index); f = StringValuePtr(v); if ((n = RSTRING_LEN(v)) < len) continue; if (strncmp(f, feature, len) != 0) { if (expanded) continue; - if (!load_path) load_path = get_expanded_load_path(vm); + if (!load_path) load_path = get_expanded_load_path((rb_box_t *)box); if (!(p = loaded_feature_path(f, n, feature, len, type, load_path))) continue; expanded = 1; @@ -595,14 +574,14 @@ rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expa } } - loading_tbl = get_loading_table(vm); + loading_tbl = box->loading_table; f = 0; if (!expanded && !rb_is_absolute_path(feature)) { struct loaded_feature_searching fs; fs.name = feature; fs.len = len; fs.type = type; - fs.load_path = load_path ? load_path : get_expanded_load_path(vm); + fs.load_path = load_path ? load_path : get_expanded_load_path((rb_box_t *)box); fs.result = 0; st_foreach(loading_tbl, loaded_feature_path_i, (st_data_t)&fs); if ((f = fs.result) != 0) { @@ -657,7 +636,7 @@ rb_provided(const char *feature) } static int -feature_provided(rb_vm_t *vm, const char *feature, const char **loading) +feature_provided(rb_box_t *box, const char *feature, const char **loading) { const char *ext = strrchr(feature, '.'); VALUE fullpath = 0; @@ -669,15 +648,15 @@ feature_provided(rb_vm_t *vm, const char *feature, const char **loading) } if (ext && !strchr(ext, '/')) { if (IS_RBEXT(ext)) { - if (rb_feature_p(vm, feature, ext, TRUE, FALSE, loading)) return TRUE; + if (rb_feature_p(box, feature, ext, TRUE, FALSE, loading)) return TRUE; return FALSE; } else if (IS_SOEXT(ext) || IS_DLEXT(ext)) { - if (rb_feature_p(vm, feature, ext, FALSE, FALSE, loading)) return TRUE; + if (rb_feature_p(box, feature, ext, FALSE, FALSE, loading)) return TRUE; return FALSE; } } - if (rb_feature_p(vm, feature, 0, TRUE, FALSE, loading)) + if (rb_feature_p(box, feature, 0, TRUE, FALSE, loading)) return TRUE; RB_GC_GUARD(fullpath); return FALSE; @@ -686,35 +665,40 @@ feature_provided(rb_vm_t *vm, const char *feature, const char **loading) int rb_feature_provided(const char *feature, const char **loading) { - return feature_provided(GET_VM(), feature, loading); + rb_box_t *box = (rb_box_t *)rb_current_box(); + return feature_provided(box, feature, loading); } static void -rb_provide_feature(rb_vm_t *vm, VALUE feature) +rb_provide_feature(const rb_box_t *box, VALUE feature) { VALUE features; - features = get_loaded_features(vm); + features = box->loaded_features; if (OBJ_FROZEN(features)) { rb_raise(rb_eRuntimeError, "$LOADED_FEATURES is frozen; cannot append feature"); } feature = rb_fstring(feature); - get_loaded_features_index(vm); + get_loaded_features_index(box); // If loaded_features and loaded_features_snapshot share the same backing // array, pushing into it would cause the whole array to be copied. // To avoid this we first clear loaded_features_snapshot. - rb_ary_clear(vm->loaded_features_snapshot); + rb_ary_clear(box->loaded_features_snapshot); rb_ary_push(features, feature); - features_index_add(vm, feature, INT2FIX(RARRAY_LEN(features)-1)); - reset_loaded_features_snapshot(vm); + features_index_add(box, feature, INT2FIX(RARRAY_LEN(features)-1)); + reset_loaded_features_snapshot(box); } void rb_provide(const char *feature) { - rb_provide_feature(GET_VM(), rb_fstring_cstr(feature)); + /* + * rb_provide() must use rb_current_box to store provided features + * in the current box's loaded_features, etc. + */ + rb_provide_feature(rb_current_box(), rb_fstring_cstr(feature)); } NORETURN(static void load_failed(VALUE)); @@ -735,14 +719,14 @@ realpath_internal_cached(VALUE hash, VALUE path) static inline void load_iseq_eval(rb_execution_context_t *ec, VALUE fname) { + const rb_box_t *box = rb_loading_box(); const rb_iseq_t *iseq = rb_iseq_load_iseq(fname); if (!iseq) { rb_execution_context_t *ec = GET_EC(); VALUE v = rb_vm_push_frame_fname(ec, fname); - rb_thread_t *th = rb_ec_thread_ptr(ec); - VALUE realpath_map = get_loaded_features_realpath_map(th->vm); + VALUE realpath_map = box->loaded_features_realpath_map; if (rb_ruby_prism_p()) { pm_parse_result_t result = { 0 }; @@ -786,13 +770,15 @@ load_iseq_eval(rb_execution_context_t *ec, VALUE fname) RB_GC_GUARD(v); } rb_exec_event_hook_script_compiled(ec, iseq, Qnil); - rb_iseq_eval(iseq); + + rb_iseq_eval(iseq, box); } static inline enum ruby_tag_type load_wrapping(rb_execution_context_t *ec, VALUE fname, VALUE load_wrapper) { enum ruby_tag_type state; + rb_box_t *box; rb_thread_t *th = rb_ec_thread_ptr(ec); volatile VALUE wrapper = th->top_wrapper; volatile VALUE self = th->top_self; @@ -803,7 +789,16 @@ load_wrapping(rb_execution_context_t *ec, VALUE fname, VALUE load_wrapper) ec->errinfo = Qnil; /* ensure */ /* load in module as toplevel */ - th->top_self = rb_obj_clone(rb_vm_top_self()); + if (BOX_OBJ_P(load_wrapper)) { + box = rb_get_box_t(load_wrapper); + if (!box->top_self) { + box->top_self = rb_obj_clone(rb_vm_top_self()); + } + th->top_self = box->top_self; + } + else { + th->top_self = rb_obj_clone(rb_vm_top_self()); + } th->top_wrapper = load_wrapper; rb_extend_object(th->top_self, th->top_wrapper); @@ -838,7 +833,9 @@ raise_load_if_failed(rb_execution_context_t *ec, enum ruby_tag_type state) static void rb_load_internal(VALUE fname, VALUE wrap) { + VALUE box_value; rb_execution_context_t *ec = GET_EC(); + const rb_box_t *box = rb_loading_box(); enum ruby_tag_type state = TAG_NONE; if (RTEST(wrap)) { if (!RB_TYPE_P(wrap, T_MODULE)) { @@ -846,6 +843,10 @@ rb_load_internal(VALUE fname, VALUE wrap) } state = load_wrapping(ec, fname, wrap); } + else if (BOX_OPTIONAL_P(box)) { + box_value = box->box_object; + state = load_wrapping(ec, fname, box_value); + } else { load_iseq_eval(ec, fname); } @@ -874,6 +875,40 @@ rb_load_protect(VALUE fname, int wrap, int *pstate) if (state != TAG_NONE) *pstate = state; } +static VALUE +load_entrypoint_internal(VALUE fname, VALUE wrap) +{ + VALUE path, orig_fname; + + orig_fname = rb_get_path_check_to_string(fname); + fname = rb_str_encode_ospath(orig_fname); + RUBY_DTRACE_HOOK(LOAD_ENTRY, RSTRING_PTR(orig_fname)); + + path = rb_find_file(fname); + if (!path) { + if (!rb_file_load_ok(RSTRING_PTR(fname))) + load_failed(orig_fname); + path = fname; + } + rb_load_internal(path, wrap); + + RUBY_DTRACE_HOOK(LOAD_RETURN, RSTRING_PTR(orig_fname)); + + return Qtrue; +} + +VALUE +rb_load_entrypoint(VALUE args) +{ + VALUE fname, wrap; + if (RARRAY_LEN(args) != 2) { + rb_bug("invalid arguments: %ld", RARRAY_LEN(args)); + } + fname = rb_ary_entry(args, 0); + wrap = rb_ary_entry(args, 1); + return load_entrypoint_internal(fname, wrap); +} + /* * call-seq: * load(filename, wrap=false) -> true @@ -907,32 +942,16 @@ rb_load_protect(VALUE fname, int wrap, int *pstate) static VALUE rb_f_load(int argc, VALUE *argv, VALUE _) { - VALUE fname, wrap, path, orig_fname; - + VALUE fname, wrap; rb_scan_args(argc, argv, "11", &fname, &wrap); - - orig_fname = rb_get_path_check_to_string(fname); - fname = rb_str_encode_ospath(orig_fname); - RUBY_DTRACE_HOOK(LOAD_ENTRY, RSTRING_PTR(orig_fname)); - - path = rb_find_file(fname); - if (!path) { - if (!rb_file_load_ok(RSTRING_PTR(fname))) - load_failed(orig_fname); - path = fname; - } - rb_load_internal(path, wrap); - - RUBY_DTRACE_HOOK(LOAD_RETURN, RSTRING_PTR(orig_fname)); - - return Qtrue; + return load_entrypoint_internal(fname, wrap); } static char * -load_lock(rb_vm_t *vm, const char *ftptr, bool warn) +load_lock(const rb_box_t *box, const char *ftptr, bool warn) { st_data_t data; - st_table *loading_tbl = get_loading_table(vm); + st_table *loading_tbl = box->loading_table; if (!st_lookup(loading_tbl, (st_data_t)ftptr, &data)) { /* partial state */ @@ -974,11 +993,11 @@ release_thread_shield(st_data_t *key, st_data_t *value, st_data_t done, int exis } static void -load_unlock(rb_vm_t *vm, const char *ftptr, int done) +load_unlock(const rb_box_t *box, const char *ftptr, int done) { if (ftptr) { st_data_t key = (st_data_t)ftptr; - st_table *loading_tbl = get_loading_table(vm); + st_table *loading_tbl = box->loading_table; st_update(loading_tbl, key, release_thread_shield, done); } @@ -1029,6 +1048,17 @@ rb_f_require(VALUE obj, VALUE fname) return rb_require_string(fname); } +VALUE +rb_require_relative_entrypoint(VALUE fname) +{ + VALUE base = rb_current_realfilepath(); + if (NIL_P(base)) { + rb_loaderror("cannot infer basepath"); + } + base = rb_file_dirname(base); + return rb_require_string_internal(rb_file_absolute_path(fname, base), false); +} + /* * call-seq: * require_relative(string) -> true or false @@ -1041,18 +1071,13 @@ rb_f_require(VALUE obj, VALUE fname) VALUE rb_f_require_relative(VALUE obj, VALUE fname) { - VALUE base = rb_current_realfilepath(); - if (NIL_P(base)) { - rb_loaderror("cannot infer basepath"); - } - base = rb_file_dirname(base); - return rb_require_string_internal(rb_file_absolute_path(fname, base), false); + return rb_require_relative_entrypoint(fname); } -typedef int (*feature_func)(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expanded, const char **fn); +typedef int (*feature_func)(const rb_box_t *box, const char *feature, const char *ext, int rb, int expanded, const char **fn); static int -search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_feature_p) +search_required(const rb_box_t *box, VALUE fname, volatile VALUE *path, feature_func rb_feature_p) { VALUE tmp; char *ext, *ftptr; @@ -1063,20 +1088,20 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_ ext = strrchr(ftptr = RSTRING_PTR(fname), '.'); if (ext && !strchr(ext, '/')) { if (IS_RBEXT(ext)) { - if (rb_feature_p(vm, ftptr, ext, TRUE, FALSE, &loading)) { + if (rb_feature_p(box, ftptr, ext, TRUE, FALSE, &loading)) { if (loading) *path = rb_filesystem_str_new_cstr(loading); return 'r'; } if ((tmp = rb_find_file(fname)) != 0) { ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (!rb_feature_p(vm, ftptr, ext, TRUE, TRUE, &loading) || loading) + if (!rb_feature_p(box, ftptr, ext, TRUE, TRUE, &loading) || loading) *path = tmp; return 'r'; } return 0; } else if (IS_SOEXT(ext)) { - if (rb_feature_p(vm, ftptr, ext, FALSE, FALSE, &loading)) { + if (rb_feature_p(box, ftptr, ext, FALSE, FALSE, &loading)) { if (loading) *path = rb_filesystem_str_new_cstr(loading); return 's'; } @@ -1085,25 +1110,25 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_ OBJ_FREEZE(tmp); if ((tmp = rb_find_file(tmp)) != 0) { ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (!rb_feature_p(vm, ftptr, ext, FALSE, TRUE, &loading) || loading) + if (!rb_feature_p(box, ftptr, ext, FALSE, TRUE, &loading) || loading) *path = tmp; return 's'; } } else if (IS_DLEXT(ext)) { - if (rb_feature_p(vm, ftptr, ext, FALSE, FALSE, &loading)) { + if (rb_feature_p(box, ftptr, ext, FALSE, FALSE, &loading)) { if (loading) *path = rb_filesystem_str_new_cstr(loading); return 's'; } if ((tmp = rb_find_file(fname)) != 0) { ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (!rb_feature_p(vm, ftptr, ext, FALSE, TRUE, &loading) || loading) + if (!rb_feature_p(box, ftptr, ext, FALSE, TRUE, &loading) || loading) *path = tmp; return 's'; } } } - else if ((ft = rb_feature_p(vm, ftptr, 0, FALSE, FALSE, &loading)) == 'r') { + else if ((ft = rb_feature_p(box, ftptr, 0, FALSE, FALSE, &loading)) == 'r') { if (loading) *path = rb_filesystem_str_new_cstr(loading); return 'r'; } @@ -1112,20 +1137,23 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_ // Check if it's a statically linked extension when // not already a feature and not found as a dynamic library. - if (!ft && type != loadable_ext_rb && vm->static_ext_inits) { - 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. - // See encinit.c and extinit.c (generated at build-time). - if (!ext) { - lookup_name = rb_str_dup(lookup_name); - rb_str_cat_cstr(lookup_name, ".so"); - } - ftptr = RSTRING_PTR(lookup_name); - 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'; + if (!ft && type != loadable_ext_rb) { + rb_vm_t *vm = GET_VM(); + if (vm->static_ext_inits) { + 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. + // See encinit.c and extinit.c (generated at build-time). + if (!ext) { + lookup_name = rb_str_dup(lookup_name); + rb_str_cat_cstr(lookup_name, ".so"); + } + ftptr = RSTRING_PTR(lookup_name); + 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'; + } } } @@ -1134,7 +1162,7 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_ if (ft) goto feature_present; ftptr = RSTRING_PTR(tmp); - return rb_feature_p(vm, ftptr, 0, FALSE, TRUE, 0); + return rb_feature_p(box, ftptr, 0, FALSE, TRUE, 0); default: if (ft) { @@ -1143,7 +1171,7 @@ search_required(rb_vm_t *vm, VALUE fname, volatile VALUE *path, feature_func rb_ /* fall through */ case loadable_ext_rb: ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (rb_feature_p(vm, ftptr, ext, type == loadable_ext_rb, TRUE, &loading) && !loading) + if (rb_feature_p(box, ftptr, ext, type == loadable_ext_rb, TRUE, &loading) && !loading) break; *path = tmp; } @@ -1161,42 +1189,57 @@ load_failed(VALUE fname) } static VALUE -load_ext(VALUE path) +load_ext(VALUE path, VALUE fname) { + VALUE loaded = path; + const rb_box_t *box = rb_loading_box(); + VALUE cleanup = 0; + if (BOX_USER_P(box)) { + loaded = rb_box_local_extension(box->box_object, fname, path, &cleanup); + } rb_scope_visibility_set(METHOD_VISI_PUBLIC); - return (VALUE)dln_load(RSTRING_PTR(path)); + void *handle = dln_load_feature(RSTRING_PTR(loaded), RSTRING_PTR(fname)); + if (cleanup) { + rb_box_cleanup_local_extension(cleanup); + } + RB_GC_GUARD(loaded); + RB_GC_GUARD(fname); + return (VALUE)handle; } -static bool -run_static_ext_init(rb_vm_t *vm, const char *feature) +static VALUE +run_static_ext_init(VALUE vm_ptr, VALUE feature_value) { + rb_vm_t *vm = (rb_vm_t *)vm_ptr; + const char *feature = RSTRING_PTR(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)) { ((void (*)(void))init_func)(); - return true; + return Qtrue; } - return false; + return Qfalse; } static int -no_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expanded, const char **fn) +no_feature_p(const rb_box_t *box, const char *feature, const char *ext, int rb, int expanded, const char **fn) { return 0; } -// Documented in doc/globals.rdoc +// Documented in doc/language/globals.md VALUE rb_resolve_feature_path(VALUE klass, VALUE fname) { VALUE path; int found; VALUE sym; + const rb_box_t *box = rb_loading_box(); fname = rb_get_path(fname); path = rb_str_encode_ospath(fname); - found = search_required(GET_VM(), path, &path, no_feature_p); + found = search_required(box, path, &path, no_feature_p); switch (found) { case 'r': @@ -1213,14 +1256,14 @@ rb_resolve_feature_path(VALUE klass, VALUE fname) } static void -ext_config_push(rb_thread_t *th, struct rb_ext_config *prev) +ext_config_push(rb_thread_t *th, volatile struct rb_ext_config *prev) { *prev = th->ext_config; th->ext_config = (struct rb_ext_config){0}; } static void -ext_config_pop(rb_thread_t *th, struct rb_ext_config *prev) +ext_config_pop(rb_thread_t *th, volatile struct rb_ext_config *prev) { th->ext_config = *prev; } @@ -1243,22 +1286,24 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa { volatile int result = -1; rb_thread_t *th = rb_ec_thread_ptr(ec); + const rb_box_t *box = rb_loading_box(); volatile const struct { VALUE wrapper, self, errinfo; rb_execution_context_t *ec; + const rb_box_t *box; } saved = { th->top_wrapper, th->top_self, ec->errinfo, - ec, + ec, box, }; enum ruby_tag_type state; char *volatile ftptr = 0; VALUE path; volatile VALUE saved_path; volatile VALUE realpath = 0; - VALUE realpaths = get_loaded_features_realpaths(th->vm); - VALUE realpath_map = get_loaded_features_realpath_map(th->vm); + VALUE realpaths = box->loaded_features_realpaths; + VALUE realpath_map = box->loaded_features_realpath_map; volatile bool reset_ext_config = false; - struct rb_ext_config prev_ext_config; + volatile struct rb_ext_config prev_ext_config; path = rb_str_encode_ospath(fname); RUBY_DTRACE_HOOK(REQUIRE_ENTRY, RSTRING_PTR(fname)); @@ -1272,18 +1317,18 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa int found; RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, RSTRING_PTR(fname)); - found = search_required(th->vm, path, &saved_path, rb_feature_p); + found = search_required(box, path, &saved_path, rb_feature_p); RUBY_DTRACE_HOOK(FIND_REQUIRE_RETURN, RSTRING_PTR(fname)); path = saved_path; if (found) { - if (!path || !(ftptr = load_lock(th->vm, RSTRING_PTR(path), warn))) { + if (!path || !(ftptr = load_lock(box, RSTRING_PTR(path), warn))) { result = 0; } else if (!*ftptr) { result = TAG_RETURN; } - else if (found == 's' && run_static_ext_init(th->vm, RSTRING_PTR(path))) { + else if (found == 's' && RTEST(rb_vm_call_cfunc_in_box(Qnil, run_static_ext_init, (VALUE)th->vm, path, path, box))) { result = TAG_RETURN; } else if (RTEST(rb_hash_aref(realpaths, @@ -1299,9 +1344,8 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa case 's': reset_ext_config = true; ext_config_push(th, &prev_ext_config); - handle = rb_vm_call_cfunc(rb_vm_top_self(), load_ext, - path, VM_BLOCK_HANDLER_NONE, path); - rb_hash_aset(ruby_dln_libmap, path, SVALUE2NUM((SIGNED_VALUE)handle)); + handle = rb_vm_call_cfunc_in_box(box->top_self, load_ext, path, fname, path, box); + rb_hash_aset(box->ruby_dln_libmap, path, PTR2NUM(handle)); break; } result = TAG_RETURN; @@ -1311,13 +1355,14 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa EC_POP_TAG(); ec = saved.ec; + box = saved.box; rb_thread_t *th2 = rb_ec_thread_ptr(ec); th2->top_self = saved.self; th2->top_wrapper = saved.wrapper; if (reset_ext_config) ext_config_pop(th2, &prev_ext_config); path = saved_path; - if (ftptr) load_unlock(th2->vm, RSTRING_PTR(path), !state); + if (ftptr) load_unlock(box, RSTRING_PTR(path), !state); if (state) { if (state == TAG_FATAL || state == TAG_THROW) { @@ -1343,7 +1388,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa } if (result == TAG_RETURN) { - rb_provide_feature(th2->vm, path); + rb_provide_feature(box, path); VALUE real = realpath; if (real) { real = rb_fstring(real); @@ -1360,6 +1405,10 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa int rb_require_internal_silent(VALUE fname) { + if (!rb_ractor_main_p()) { + return NUM2INT(rb_ractor_require(fname, true)); + } + rb_execution_context_t *ec = GET_EC(); return require_internal(ec, fname, 1, false); } @@ -1374,7 +1423,7 @@ rb_require_internal(VALUE fname) int ruby_require_internal(const char *fname, unsigned int len) { - struct RString fake; + struct RString fake = {RBASIC_INIT}; VALUE str = rb_setup_fake_str(&fake, fname, len, 0); rb_execution_context_t *ec = GET_EC(); int result = require_internal(ec, str, 0, RTEST(ruby_verbose)); @@ -1396,7 +1445,7 @@ rb_require_string_internal(VALUE fname, bool resurrect) // main ractor check if (!rb_ractor_main_p()) { if (resurrect) fname = rb_str_resurrect(fname); - return rb_ractor_require(fname); + return rb_ractor_require(fname, false); } else { int result = require_internal(ec, fname, 1, RTEST(ruby_verbose)); @@ -1416,7 +1465,7 @@ rb_require_string_internal(VALUE fname, bool resurrect) VALUE rb_require(const char *fname) { - struct RString fake; + struct RString fake = {RBASIC_INIT}; VALUE str = rb_setup_fake_str(&fake, fname, strlen(fname), 0); return rb_require_string_internal(str, true); } @@ -1443,8 +1492,9 @@ 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(vm, name, 0)) + if (feature_provided((rb_box_t *)box, name, 0)) return; inits_table = vm->static_ext_inits; @@ -1595,6 +1645,7 @@ rb_ext_resolve_symbol(const char* fname, const char* symbol) VALUE path; char *ext; VALUE fname_str = rb_str_new_cstr(fname); + const rb_box_t *box = rb_loading_box(); resolved = rb_resolve_feature_path((VALUE)NULL, fname_str); if (NIL_P(resolved)) { @@ -1602,7 +1653,7 @@ rb_ext_resolve_symbol(const char* fname, const char* symbol) if (!ext || !IS_SOEXT(ext)) { rb_str_cat_cstr(fname_str, ".so"); } - if (rb_feature_p(GET_VM(), fname, 0, FALSE, FALSE, 0)) { + if (rb_feature_p(box, fname, 0, FALSE, FALSE, 0)) { return dln_symbol(NULL, symbol); } return NULL; @@ -1611,38 +1662,28 @@ rb_ext_resolve_symbol(const char* fname, const char* symbol) return NULL; } path = rb_ary_entry(resolved, 1); - handle = rb_hash_lookup(ruby_dln_libmap, path); + handle = rb_hash_lookup(box->ruby_dln_libmap, path); if (NIL_P(handle)) { return NULL; } - return dln_symbol((void *)NUM2SVALUE(handle), symbol); + return dln_symbol(NUM2PTR(handle), symbol); } void Init_load(void) { - rb_vm_t *vm = GET_VM(); static const char var_load_path[] = "$:"; ID id_load_path = rb_intern2(var_load_path, sizeof(var_load_path)-1); - rb_define_hooked_variable(var_load_path, (VALUE*)vm, load_path_getter, rb_gvar_readonly_setter); + rb_define_hooked_variable(var_load_path, 0, load_path_getter, rb_gvar_readonly_setter); + rb_gvar_box_ready(var_load_path); rb_alias_variable(rb_intern_const("$-I"), id_load_path); rb_alias_variable(rb_intern_const("$LOAD_PATH"), id_load_path); - vm->load_path = rb_ary_new(); - vm->expanded_load_path = rb_ary_hidden_new(0); - vm->load_path_snapshot = rb_ary_hidden_new(0); - vm->load_path_check_cache = 0; - rb_define_singleton_method(vm->load_path, "resolve_feature_path", rb_resolve_feature_path, 1); rb_define_virtual_variable("$\"", get_LOADED_FEATURES, 0); - rb_define_virtual_variable("$LOADED_FEATURES", get_LOADED_FEATURES, 0); - vm->loaded_features = rb_ary_new(); - vm->loaded_features_snapshot = rb_ary_hidden_new(0); - vm->loaded_features_index = st_init_numtable(); - vm->loaded_features_realpaths = rb_hash_new(); - rb_obj_hide(vm->loaded_features_realpaths); - vm->loaded_features_realpath_map = rb_hash_new(); - rb_obj_hide(vm->loaded_features_realpath_map); + rb_gvar_box_ready("$\""); + rb_define_virtual_variable("$LOADED_FEATURES", get_LOADED_FEATURES, 0); // TODO: rb_alias_variable ? + rb_gvar_box_ready("$LOADED_FEATURES"); rb_define_global_function("load", rb_f_load, -1); rb_define_global_function("require", rb_f_require, 1); @@ -1651,7 +1692,4 @@ Init_load(void) rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, -1); rb_define_global_function("autoload", rb_f_autoload, 2); rb_define_global_function("autoload?", rb_f_autoload_p, -1); - - ruby_dln_libmap = rb_hash_new_with_size(0); - rb_vm_register_global_object(ruby_dln_libmap); } |