diff options
Diffstat (limited to 'load.c')
| -rw-r--r-- | load.c | 1408 |
1 files changed, 850 insertions, 558 deletions
@@ -5,24 +5,33 @@ #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" -#include "internal/parse.h" +#include "internal/ruby_parser.h" #include "internal/thread.h" #include "internal/variable.h" #include "iseq.h" #include "probes.h" +#include "darray.h" #include "ruby/encoding.h" #include "ruby/util.h" - -static VALUE ruby_dln_librefs; +#include "ractor_core.h" +#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) +enum { + loadable_ext_rb = (0+ /* .rb extension is the first in both tables */ + 1) /* offset by rb_find_file_ext() */ +}; + static const char *const loadable_ext[] = { ".rb", DLEXT, 0 @@ -46,144 +55,133 @@ 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; - ary = rb_ary_tmp_new(RARRAY_LEN(load_path)); + ary = rb_ary_hidden_new(RARRAY_LEN(load_path)); for (i = 0; i < RARRAY_LEN(load_path); ++i) { - VALUE path, as_str, expanded_path; - int is_string, non_cache; - char *as_cstr; - as_str = path = RARRAY_AREF(load_path, i); - is_string = RB_TYPE_P(path, T_STRING) ? 1 : 0; - non_cache = !is_string ? 1 : 0; + VALUE path, as_str, expanded_path; + int is_string, non_cache; + char *as_cstr; + as_str = path = RARRAY_AREF(load_path, i); + is_string = RB_TYPE_P(path, T_STRING) ? 1 : 0; + non_cache = !is_string ? 1 : 0; as_str = rb_get_path_check_to_string(path); - as_cstr = RSTRING_PTR(as_str); - - if (!non_cache) { - if ((type == EXPAND_RELATIVE && - rb_is_absolute_path(as_cstr)) || - (type == EXPAND_HOME && - (!as_cstr[0] || as_cstr[0] != '~')) || - (type == EXPAND_NON_CACHE)) { - /* Use cached expanded path. */ - rb_ary_push(ary, RARRAY_AREF(expanded_load_path, i)); - continue; - } - } - if (!*has_relative && !rb_is_absolute_path(as_cstr)) - *has_relative = 1; - if (!*has_non_cache && non_cache) - *has_non_cache = 1; - /* Freeze only string object. We expand other objects every time. */ - if (is_string) - rb_str_freeze(path); + as_cstr = RSTRING_PTR(as_str); + + if (!non_cache) { + if ((type == EXPAND_RELATIVE && + rb_is_absolute_path(as_cstr)) || + (type == EXPAND_HOME && + (!as_cstr[0] || as_cstr[0] != '~')) || + (type == EXPAND_NON_CACHE)) { + /* Use cached expanded path. */ + rb_ary_push(ary, RARRAY_AREF(expanded_load_path, i)); + continue; + } + } + if (!*has_relative && !rb_is_absolute_path(as_cstr)) + *has_relative = 1; + if (!*has_non_cache && non_cache) + *has_non_cache = 1; + /* Freeze only string object. We expand other objects every time. */ + if (is_string) + rb_str_freeze(path); as_str = rb_get_path_check_convert(as_str); - expanded_path = rb_check_realpath(Qnil, as_str, NULL); - if (NIL_P(expanded_path)) expanded_path = as_str; - rb_ary_push(ary, rb_fstring(expanded_path)); + expanded_path = rb_check_realpath(Qnil, as_str, NULL); + if (NIL_P(expanded_path)) expanded_path = as_str; + rb_ary_push(ary, rb_fstring(expanded_path)); } - rb_obj_freeze(ary); - vm->expanded_load_path = ary; - rb_ary_replace(vm->load_path_snapshot, vm->load_path); + rb_ary_freeze(ary); + 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; - - if (!rb_ary_shared_with_p(vm->load_path_snapshot, vm->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); - if (has_relative) { - vm->load_path_check_cache = rb_dir_getwd_ospath(); - } - else if (has_non_cache) { - /* Non string object. */ - vm->load_path_check_cache = non_cache; - } - else { - vm->load_path_check_cache = 0; - } - } - else if (vm->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, - &has_relative, &has_non_cache); - } - else if (vm->load_path_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)) { - /* 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, - &has_relative, &has_non_cache); - } - else { - /* Expand only tilde (User HOME) and non-cacheable objects. */ - rb_construct_expanded_load_path(vm, EXPAND_HOME, - &has_relative, &has_non_cache); - } - } - return vm->expanded_load_path; + const VALUE load_path_snapshot = box->load_path_snapshot; + const VALUE load_path = box->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(box, EXPAND_ALL, &has_relative, &has_non_cache); + if (has_relative) { + box->load_path_check_cache = rb_dir_getwd_ospath(); + } + else if (has_non_cache) { + /* Non string object. */ + box->load_path_check_cache = non_cache; + } + else { + box->load_path_check_cache = 0; + } + } + 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(box, EXPAND_NON_CACHE, + &has_relative, &has_non_cache); + } + else if (check_cache) { + int has_relative = 1, has_non_cache = 1; + VALUE cwd = rb_dir_getwd_ospath(); + if (!rb_str_equal(check_cache, cwd)) { + /* Current working directory or filesystem encoding was changed. + Expand relative load path and non-cacheable objects again. */ + 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(box, EXPAND_HOME, + &has_relative, &has_non_cache); + } + } + 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; -} - -static VALUE -get_loaded_features(rb_vm_t *vm) -{ - return vm->loaded_features; + return get_expanded_load_path((rb_box_t *)rb_loading_box()); } static VALUE -get_loaded_features_realpaths(rb_vm_t *vm) +load_path_getter(ID _x, VALUE * _y) { - return vm->loaded_features_realpaths; + 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 @@ -201,61 +199,95 @@ is_rbext_path(VALUE feature_path) return IS_RBEXT(RSTRING_PTR(feature_path) + len - rbext_len); } +typedef rb_darray(long) feature_indexes_t; + +struct features_index_add_single_args { + const rb_box_t *box; + VALUE offset; + bool rb; +}; + +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; + const rb_box_t *box = args->box; + VALUE offset = args->offset; + bool rb = args->rb; + + if (existing) { + VALUE this_feature_index = *value; + + if (FIXNUM_P(this_feature_index)) { + VALUE loaded_features = box->loaded_features; + VALUE this_feature_path = RARRAY_AREF(loaded_features, FIX2LONG(this_feature_index)); + + feature_indexes_t feature_indexes; + rb_darray_make(&feature_indexes, 2); + int top = (rb && !is_rbext_path(this_feature_path)) ? 1 : 0; + rb_darray_set(feature_indexes, top^0, FIX2LONG(this_feature_index)); + rb_darray_set(feature_indexes, top^1, FIX2LONG(offset)); + + RUBY_ASSERT(rb_darray_size(feature_indexes) == 2); + // assert feature_indexes does not look like a special const + RUBY_ASSERT(!SPECIAL_CONST_P((VALUE)feature_indexes)); + + *value = (st_data_t)feature_indexes; + } + else { + feature_indexes_t feature_indexes = (feature_indexes_t)this_feature_index; + long pos = -1; + + if (rb) { + 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); + Check_Type(this_feature_path, T_STRING); + if (!is_rbext_path(this_feature_path)) { + pos = i; + break; + } + } + } + + rb_darray_append(&feature_indexes, FIX2LONG(offset)); + /* darray may realloc which will change the pointer */ + *value = (st_data_t)feature_indexes; + + if (pos >= 0) { + long *ptr = rb_darray_data_ptr(feature_indexes); + long len = rb_darray_size(feature_indexes); + MEMMOVE(ptr + pos + 1, ptr + pos, long, len - pos - 1); + ptr[pos] = FIX2LONG(offset); + } + } + } + else { + *value = offset; + } + + return ST_CONTINUE; +} + 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; - VALUE this_feature_index = Qnil; st_data_t short_feature_key; - st_data_t data; Check_Type(offset, T_FIXNUM); short_feature_key = feature_key(str, len); - features_index = get_loaded_features_index_raw(vm); - if (!st_lookup(features_index, short_feature_key, &data) || - NIL_P(this_feature_index = (VALUE)data)) { - st_insert(features_index, short_feature_key, (st_data_t)offset); - } - else if (FIXNUM_P(this_feature_index)) { - VALUE loaded_features = get_loaded_features(vm); - VALUE this_feature_path = RARRAY_AREF(loaded_features, FIX2LONG(this_feature_index)); - VALUE feature_indexes[2]; - int top = (rb && !is_rbext_path(this_feature_path)) ? 1 : 0; - feature_indexes[top^0] = this_feature_index; - feature_indexes[top^1] = offset; - this_feature_index = (VALUE)xcalloc(1, sizeof(struct RArray)); - RBASIC(this_feature_index)->flags = T_ARRAY; /* fake VALUE, do not mark/sweep */ - rb_ary_cat(this_feature_index, feature_indexes, numberof(feature_indexes)); - st_insert(features_index, short_feature_key, (st_data_t)this_feature_index); - } - else { - long pos = -1; - - Check_Type(this_feature_index, T_ARRAY); - if (rb) { - VALUE loaded_features = get_loaded_features(vm); - for (long i = 0; i < RARRAY_LEN(this_feature_index); ++i) { - VALUE idx = RARRAY_AREF(this_feature_index, i); - VALUE this_feature_path = RARRAY_AREF(loaded_features, FIX2LONG(idx)); - Check_Type(this_feature_path, T_STRING); - if (!is_rbext_path(this_feature_path)) { - /* as this_feature_index is a fake VALUE, `push` (which - * doesn't wb_unprotect like as rb_ary_splice) first, - * then rotate partially. */ - pos = i; - break; - } - } - } - rb_ary_push(this_feature_index, offset); - if (pos >= 0) { - VALUE *ptr = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(this_feature_index); - long len = RARRAY_LEN(this_feature_index); - MEMMOVE(ptr + pos, ptr + pos + 1, VALUE, len - pos - 1); - ptr[pos] = offset; - } - } + features_index = get_loaded_features_index_raw(box); + + struct features_index_add_single_args args = { + .box = box, + .offset = offset, + .rb = rb, + }; + + st_update(features_index, short_feature_key, features_index_add_single_callback, (st_data_t)&args); } /* Add to the loaded-features index all the required entries for @@ -267,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; @@ -276,10 +310,10 @@ features_index_add(rb_vm_t *vm, VALUE feature, VALUE offset) feature_end = feature_str + RSTRING_LEN(feature); for (ext = feature_end; ext > feature_str; ext--) - if (*ext == '.' || *ext == '/') - break; + if (*ext == '.' || *ext == '/') + break; if (*ext != '.') - ext = NULL; + ext = NULL; else rb = IS_RBEXT(ext); /* Now `ext` points to the only string matching %r{^\.[^./]*$} that is @@ -287,20 +321,20 @@ features_index_add(rb_vm_t *vm, VALUE feature, VALUE offset) p = ext ? ext : feature_end; while (1) { - p--; - while (p >= feature_str && *p != '/') - p--; - 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); - if (ext) { - features_index_add_single(vm, p + 1, ext - p - 1, offset, rb); - } - } - features_index_add_single(vm, feature_str, feature_end - feature_str, offset, false); + p--; + while (p >= feature_str && *p != '/') + p--; + if (p < feature_str) + break; + /* Now *p == '/'. We reach this point for every '/' in `feature`. */ + features_index_add_single(box, p + 1, feature_end - p - 1, offset, false); + if (ext) { + features_index_add_single(box, p + 1, ext - p - 1, offset, rb); + } + } + 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); } } @@ -309,47 +343,63 @@ loaded_features_index_clear_i(st_data_t key, st_data_t val, st_data_t arg) { VALUE obj = (VALUE)val; if (!SPECIAL_CONST_P(obj)) { - rb_ary_free(obj); - ruby_sized_xfree((void *)obj, sizeof(struct RArray)); + rb_darray_free((void *)obj); } return ST_DELETE; } 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)) { - /* 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); + 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(box->loaded_features_index, loaded_features_index_clear_i, 0); - VALUE realpaths = vm->loaded_features_realpaths; + 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); - features = vm->loaded_features; - for (i = 0; i < RARRAY_LEN(features); i++) { - VALUE entry, as_str; - as_str = entry = rb_ary_entry(features, i); - StringValue(as_str); - as_str = rb_fstring(rb_str_freeze(as_str)); - if (as_str != entry) - rb_ary_store(features, i, as_str); - features_index_add(vm, as_str, INT2FIX(i)); - } - reset_loaded_features_snapshot(vm); - - features = rb_ary_dup(vm->loaded_features_snapshot); + rb_hash_clear(realpath_map); + + /* 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); + StringValue(as_str); + as_str = rb_fstring(as_str); + if (as_str != entry) + rb_ary_store(features, i, as_str); + 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(box); + + features = box->loaded_features_snapshot; long j = RARRAY_LEN(features); for (i = 0; i < j; i++) { VALUE as_str = rb_ary_entry(features, i); - VALUE realpath = rb_check_realpath(Qnil, as_str, NULL); - if (NIL_P(realpath)) realpath = as_str; - rb_hash_aset(realpaths, rb_fstring(realpath), Qtrue); + VALUE realpath = rb_hash_aref(previous_realpath_map, as_str); + if (NIL_P(realpath)) { + realpath = rb_check_realpath(Qnil, as_str, NULL); + if (NIL_P(realpath)) realpath = as_str; + realpath = rb_fstring(realpath); + } + rb_hash_aset(realpaths, realpath, Qtrue); + 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 @@ -365,7 +415,7 @@ get_loaded_features_index(rb_vm_t *vm) */ static VALUE loaded_feature_path(const char *name, long vlen, const char *feature, long len, - int type, VALUE load_path) + int type, VALUE load_path) { long i; long plen; @@ -373,36 +423,36 @@ loaded_feature_path(const char *name, long vlen, const char *feature, long len, if (vlen < len+1) return 0; if (strchr(feature, '.') && !strncmp(name+(vlen-len), feature, len)) { - plen = vlen - len; + plen = vlen - len; } else { - for (e = name + vlen; name != e && *e != '.' && *e != '/'; --e); - if (*e != '.' || - e-name < len || - strncmp(e-len, feature, len)) - return 0; - plen = e - name - len; + for (e = name + vlen; name != e && *e != '.' && *e != '/'; --e); + if (*e != '.' || + e-name < len || + strncmp(e-len, feature, len)) + return 0; + plen = e - name - len; } if (plen > 0 && name[plen-1] != '/') { - return 0; + return 0; } if (type == 's' ? !IS_DLEXT(&name[plen+len]) : - type == 'r' ? !IS_RBEXT(&name[plen+len]) : - 0) { - return 0; + type == 'r' ? !IS_RBEXT(&name[plen+len]) : + 0) { + return 0; } /* Now name == "#{prefix}/#{feature}#{ext}" where ext is acceptable (possibly empty) and prefix is some string of length plen. */ if (plen > 0) --plen; /* exclude '.' */ for (i = 0; i < RARRAY_LEN(load_path); ++i) { - VALUE p = RARRAY_AREF(load_path, i); - const char *s = StringValuePtr(p); - long n = RSTRING_LEN(p); + VALUE p = RARRAY_AREF(load_path, i); + const char *s = StringValuePtr(p); + long n = RSTRING_LEN(p); - if (n != plen) continue; - if (n && strncmp(name, s, n)) continue; - return p; + if (n != plen) continue; + if (n && strncmp(name, s, n)) continue; + return p; } return 0; } @@ -421,14 +471,20 @@ loaded_feature_path_i(st_data_t v, st_data_t b, st_data_t f) const char *s = (const char *)v; struct loaded_feature_searching *fp = (struct loaded_feature_searching *)f; VALUE p = loaded_feature_path(s, strlen(s), fp->name, fp->len, - fp->type, fp->load_path); + fp->type, fp->load_path); if (!p) return ST_CONTINUE; fp->result = s; return ST_STOP; } +/* + * Returns the type of already provided feature. + * 'r': ruby script (".rb") + * 's': shared object (".so"/"."DLEXT) + * '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; @@ -440,17 +496,17 @@ rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expa if (fn) *fn = 0; if (ext) { - elen = strlen(ext); - len = strlen(feature) - elen; - type = rb ? 'r' : 's'; + elen = strlen(ext); + len = strlen(feature) - elen; + type = rb ? 'r' : 's'; } else { - len = strlen(feature); - elen = 0; - type = 0; + len = strlen(feature); + 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 @@ -480,91 +536,91 @@ rb_feature_p(rb_vm_t *vm, const char *feature, const char *ext, int rb, int expa as any distractors, so we may ignore all other entries in `features`. */ if (st_lookup(features_index, key, &data) && !NIL_P(this_feature_index = (VALUE)data)) { - for (i = 0; ; i++) { - VALUE entry; - long index; - if (RB_TYPE_P(this_feature_index, T_ARRAY)) { - if (i >= RARRAY_LEN(this_feature_index)) break; - entry = RARRAY_AREF(this_feature_index, i); - } - else { - if (i > 0) break; - entry = this_feature_index; - } - index = FIX2LONG(entry); - - 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 (!(p = loaded_feature_path(f, n, feature, len, type, load_path))) - continue; - expanded = 1; - f += RSTRING_LEN(p) + 1; - } - if (!*(e = f + len)) { - if (ext) continue; - return 'u'; - } - if (*e != '.') continue; - if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) { - return 's'; - } - if ((rb || !ext) && (IS_RBEXT(e))) { - return 'r'; - } - } - } - - loading_tbl = get_loading_table(vm); + for (size_t i = 0; ; i++) { + long index; + if (FIXNUM_P(this_feature_index)) { + if (i > 0) break; + index = FIX2LONG(this_feature_index); + } + else { + feature_indexes_t feature_indexes = (feature_indexes_t)this_feature_index; + if (i >= rb_darray_size(feature_indexes)) break; + 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((rb_box_t *)box); + if (!(p = loaded_feature_path(f, n, feature, len, type, load_path))) + continue; + expanded = 1; + f += RSTRING_LEN(p) + 1; + } + if (!*(e = f + len)) { + if (ext) continue; + return 'u'; + } + if (*e != '.') continue; + if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) { + return 's'; + } + if ((rb || !ext) && (IS_RBEXT(e))) { + return 'r'; + } + } + } + + loading_tbl = box->loading_table; f = 0; - if (!expanded) { - 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.result = 0; - st_foreach(loading_tbl, loaded_feature_path_i, (st_data_t)&fs); - if ((f = fs.result) != 0) { - if (fn) *fn = f; - goto loading; - } + 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((rb_box_t *)box); + fs.result = 0; + st_foreach(loading_tbl, loaded_feature_path_i, (st_data_t)&fs); + if ((f = fs.result) != 0) { + if (fn) *fn = f; + goto loading; + } } if (st_get_key(loading_tbl, (st_data_t)feature, &data)) { - if (fn) *fn = (const char*)data; + if (fn) *fn = (const char*)data; goto loading; } else { - VALUE bufstr; - char *buf; - static const char so_ext[][4] = { - ".so", ".o", - }; - - if (ext && *ext) return 0; - bufstr = rb_str_tmp_new(len + DLEXT_MAXLEN); - buf = RSTRING_PTR(bufstr); - MEMCPY(buf, feature, char, len); - for (i = 0; (e = loadable_ext[i]) != 0; i++) { - strlcpy(buf + len, e, DLEXT_MAXLEN + 1); - if (st_get_key(loading_tbl, (st_data_t)buf, &data)) { - rb_str_resize(bufstr, 0); - if (fn) *fn = (const char*)data; - return i ? 's' : 'r'; - } - } - for (i = 0; i < numberof(so_ext); i++) { - strlcpy(buf + len, so_ext[i], DLEXT_MAXLEN + 1); - if (st_get_key(loading_tbl, (st_data_t)buf, &data)) { - rb_str_resize(bufstr, 0); - if (fn) *fn = (const char*)data; - return 's'; - } - } - rb_str_resize(bufstr, 0); + VALUE bufstr; + char *buf; + static const char so_ext[][4] = { + ".so", ".o", + }; + + if (ext && *ext) return 0; + bufstr = rb_str_tmp_new(len + DLEXT_MAXLEN); + buf = RSTRING_PTR(bufstr); + MEMCPY(buf, feature, char, len); + for (i = 0; (e = loadable_ext[i]) != 0; i++) { + strlcpy(buf + len, e, DLEXT_MAXLEN + 1); + if (st_get_key(loading_tbl, (st_data_t)buf, &data)) { + rb_str_resize(bufstr, 0); + if (fn) *fn = (const char*)data; + return i ? 's' : 'r'; + } + } + for (i = 0; i < numberof(so_ext); i++) { + strlcpy(buf + len, so_ext[i], DLEXT_MAXLEN + 1); + if (st_get_key(loading_tbl, (st_data_t)buf, &data)) { + rb_str_resize(bufstr, 0); + if (fn) *fn = (const char*)data; + return 's'; + } + } + rb_str_resize(bufstr, 0); } return 0; @@ -580,28 +636,28 @@ 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; if (*feature == '.' && - (feature[1] == '/' || strncmp(feature+1, "./", 2) == 0)) { - fullpath = rb_file_expand_path_fast(rb_get_path(rb_str_new2(feature)), Qnil); - feature = RSTRING_PTR(fullpath); + (feature[1] == '/' || strncmp(feature+1, "./", 2) == 0)) { + fullpath = rb_file_expand_path_fast(rb_get_path(rb_str_new2(feature)), Qnil); + feature = RSTRING_PTR(fullpath); } if (ext && !strchr(ext, '/')) { - if (IS_RBEXT(ext)) { - if (rb_feature_p(vm, 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; - return FALSE; - } - } - if (rb_feature_p(vm, feature, 0, TRUE, FALSE, loading)) - return TRUE; + if (IS_RBEXT(ext)) { + 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(box, feature, ext, FALSE, FALSE, loading)) return TRUE; + return FALSE; + } + } + if (rb_feature_p(box, feature, 0, TRUE, FALSE, loading)) + return TRUE; RB_GC_GUARD(fullpath); return FALSE; } @@ -609,57 +665,120 @@ 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"); + rb_raise(rb_eRuntimeError, + "$LOADED_FEATURES is frozen; cannot append feature"); } - rb_str_freeze(feature); - - get_loaded_features_index(vm); - rb_ary_push(features, rb_fstring(feature)); - features_index_add(vm, feature, INT2FIX(RARRAY_LEN(features)-1)); - reset_loaded_features_snapshot(vm); + feature = rb_fstring(feature); + + 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(box->loaded_features_snapshot); + rb_ary_push(features, feature); + 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)); +static inline VALUE +realpath_internal_cached(VALUE hash, VALUE path) +{ + VALUE ret = rb_hash_aref(hash, path); + if(RTEST(ret)) { + return ret; + } + + VALUE realpath = rb_realpath_internal(Qnil, path, 1); + rb_hash_aset(hash, rb_fstring(path), rb_fstring(realpath)); + return realpath; +} + 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_ast_t *ast; - VALUE parser = rb_parser_new(); - rb_parser_set_context(parser, NULL, FALSE); - ast = (rb_ast_t *)rb_parser_load_file(parser, fname); - iseq = rb_iseq_new_top(&ast->body, rb_fstring_lit("<top (required)>"), - fname, rb_realpath_internal(Qnil, fname, 1), NULL); - rb_ast_dispose(ast); + rb_execution_context_t *ec = GET_EC(); + VALUE v = rb_vm_push_frame_fname(ec, fname); + + VALUE realpath_map = box->loaded_features_realpath_map; + + if (rb_ruby_prism_p()) { + pm_parse_result_t result = { 0 }; + result.options.line = 1; + result.node.coverage_enabled = 1; + + VALUE error = pm_load_parse_file(&result, fname, NULL); + + if (error == Qnil) { + int error_state; + iseq = pm_iseq_new_top(&result.node, rb_fstring_lit("<top (required)>"), fname, realpath_internal_cached(realpath_map, fname), NULL, &error_state); + + pm_parse_result_free(&result); + + if (error_state) { + RUBY_ASSERT(iseq == NULL); + rb_jump_tag(error_state); + } + } + else { + rb_vm_pop_frame(ec); + RB_GC_GUARD(v); + pm_parse_result_free(&result); + rb_exc_raise(error); + } + } + else { + rb_ast_t *ast; + VALUE ast_value; + VALUE parser = rb_parser_new(); + rb_parser_set_context(parser, NULL, FALSE); + ast_value = rb_parser_load_file(parser, fname); + ast = rb_ruby_ast_data_get(ast_value); + + iseq = rb_iseq_new_top(ast_value, rb_fstring_lit("<top (required)>"), + fname, realpath_internal_cached(realpath_map, fname), NULL); + rb_ast_dispose(ast); + } + + rb_vm_pop_frame(ec); + 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) +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; @@ -669,9 +788,18 @@ load_wrapping(rb_execution_context_t *ec, VALUE fname) ec->errinfo = Qnil; /* ensure */ - /* load in anonymous module as toplevel */ - th->top_self = rb_obj_clone(rb_vm_top_self()); - th->top_wrapper = rb_module_new(); + /* load in module as toplevel */ + 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); EC_PUSH_TAG(ec); @@ -703,12 +831,21 @@ raise_load_if_failed(rb_execution_context_t *ec, enum ruby_tag_type state) } static void -rb_load_internal(VALUE fname, int wrap) +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 (wrap) { - state = load_wrapping(ec, fname); + if (RTEST(wrap)) { + if (!RB_TYPE_P(wrap, T_MODULE)) { + wrap = rb_module_new(); + } + 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); @@ -721,7 +858,7 @@ rb_load(VALUE fname, int wrap) { VALUE tmp = rb_find_file(FilePathValue(fname)); if (!tmp) load_failed(fname); - rb_load_internal(tmp, wrap); + rb_load_internal(tmp, RBOOL(wrap)); } void @@ -738,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 @@ -762,66 +933,43 @@ rb_load_protect(VALUE fname, int wrap, int *pstate) * LoadError will be raised. * * If the optional _wrap_ parameter is +true+, the loaded script will - * be executed under an anonymous module, protecting the calling - * program's global namespace. In no circumstance will any local - * variables in the loaded file be propagated to the loading - * environment. + * be executed under an anonymous module. If the optional _wrap_ parameter + * is a module, the loaded script will be executed under the given module. + * In no circumstance will any local variables in the loaded file be + * propagated to the loading environment. */ 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, RTEST(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 */ - ftptr = ruby_strdup(ftptr); - data = (st_data_t)rb_thread_shield_new(); - st_insert(loading_tbl, (st_data_t)ftptr, data); - return (char *)ftptr; - } - else if (imemo_type_p(data, imemo_memo)) { - struct MEMO *memo = MEMO_CAST(data); - void (*init)(void) = memo->u3.func; - data = (st_data_t)rb_thread_shield_new(); - st_insert(loading_tbl, (st_data_t)ftptr, data); - (*init)(); - return (char *)""; - } - if (warn) { - VALUE warning = rb_warning_string("loading in progress, circular require considered harmful - %s", ftptr); - rb_backtrace_each(rb_str_append, warning); - rb_warning("%"PRIsVALUE, warning); + /* partial state */ + ftptr = ruby_strdup(ftptr); + data = (st_data_t)rb_thread_shield_new(); + st_insert(loading_tbl, (st_data_t)ftptr, data); + return (char *)ftptr; + } + + if (warn && rb_thread_shield_owned((VALUE)data)) { + VALUE warning = rb_warning_string("loading in progress, circular require considered harmful - %s", ftptr); + rb_backtrace_each(rb_str_append, warning); + rb_warning("%"PRIsVALUE, warning); } switch (rb_thread_shield_wait((VALUE)data)) { case Qfalse: case Qnil: - return 0; + return 0; } return (char *)ftptr; } @@ -832,29 +980,30 @@ release_thread_shield(st_data_t *key, st_data_t *value, st_data_t done, int exis VALUE thread_shield = (VALUE)*value; if (!existing) return ST_STOP; if (done) { - rb_thread_shield_destroy(thread_shield); - /* Delete the entry even if there are waiting threads, because they - * won't load the file and won't delete the entry. */ + rb_thread_shield_destroy(thread_shield); + /* Delete the entry even if there are waiting threads, because they + * won't load the file and won't delete the entry. */ } else if (rb_thread_shield_release(thread_shield)) { - /* still in-use */ - return ST_CONTINUE; + /* still in-use */ + return ST_CONTINUE; } xfree((char *)*key); return ST_DELETE; } 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_data_t key = (st_data_t)ftptr; + st_table *loading_tbl = box->loading_table; - st_update(loading_tbl, key, release_thread_shield, done); + st_update(loading_tbl, key, release_thread_shield, done); } } +static VALUE rb_require_string_internal(VALUE fname, bool resurrect); /* * call-seq: @@ -869,15 +1018,14 @@ load_unlock(rb_vm_t *vm, const char *ftptr, int done) * If the filename starts with './' or '../', resolution is based on Dir.pwd. * * If the filename has the extension ".rb", it is loaded as a source file; if - * the extension is ".so", ".o", or ".dll", or the default shared library - * extension on the current platform, Ruby loads the shared library as a - * Ruby extension. Otherwise, Ruby tries adding ".rb", ".so", and so on - * to the name until found. If the file named cannot be found, a LoadError - * will be raised. + * the extension is ".so", ".o", or the default shared library extension on + * the current platform, Ruby loads the shared library as a Ruby extension. + * Otherwise, Ruby tries adding ".rb", ".so", and so on to the name until + * found. If the file named cannot be found, a LoadError will be raised. * - * For Ruby extensions the filename given may use any shared library - * extension. For example, on Linux the socket extension is "socket.so" and - * <code>require 'socket.dll'</code> will load the socket extension. + * For Ruby extensions the filename given may use ".so" or ".o". For example, + * on macOS the socket extension is "socket.bundle" and + * <code>require 'socket.so'</code> will load the socket extension. * * The absolute path of the loaded file is added to * <code>$LOADED_FEATURES</code> (<code>$"</code>). A file will not be @@ -900,106 +1048,136 @@ 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 * - * Ruby tries to load the library named _string_ relative to the requiring - * file's path. If the file's path cannot be determined a LoadError is raised. - * If a file is loaded +true+ is returned and false otherwise. + * Ruby tries to load the library named _string_ relative to the directory + * containing the requiring file. If the file does not exist a LoadError is + * raised. Returns +true+ if the file was loaded and +false+ if the file was + * already loaded before. */ 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(rb_file_absolute_path(fname, base)); + 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; - int type, ft = 0; + int ft = 0; const char *loading; *path = 0; 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 (loading) *path = rb_filesystem_str_new_cstr(loading); - return 'r'; - } + if (IS_RBEXT(ext)) { + 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) - *path = tmp; - return 'r'; - } - return 0; - } - else if (IS_SOEXT(ext)) { - if (rb_feature_p(vm, ftptr, ext, FALSE, FALSE, &loading)) { - if (loading) *path = rb_filesystem_str_new_cstr(loading); - return 's'; - } - tmp = rb_str_subseq(fname, 0, ext - RSTRING_PTR(fname)); - rb_str_cat2(tmp, DLEXT); - OBJ_FREEZE(tmp); + ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); + 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(box, ftptr, ext, FALSE, FALSE, &loading)) { + if (loading) *path = rb_filesystem_str_new_cstr(loading); + return 's'; + } + tmp = rb_str_subseq(fname, 0, ext - RSTRING_PTR(fname)); + rb_str_cat2(tmp, DLEXT); + 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) - *path = tmp; - return 's'; - } - } - else if (IS_DLEXT(ext)) { - if (rb_feature_p(vm, ftptr, ext, FALSE, FALSE, &loading)) { - if (loading) *path = rb_filesystem_str_new_cstr(loading); - return 's'; - } + ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); + if (!rb_feature_p(box, ftptr, ext, FALSE, TRUE, &loading) || loading) + *path = tmp; + return 's'; + } + } + else if (IS_DLEXT(ext)) { + 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) - *path = tmp; - return 's'; - } - } + ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); + 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') { - if (loading) *path = rb_filesystem_str_new_cstr(loading); - return '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'; } tmp = fname; - type = rb_find_file_ext(&tmp, ft == 's' ? ruby_ext : loadable_ext); + const unsigned int type = rb_find_file_ext(&tmp, ft == 's' ? ruby_ext : loadable_ext); + + // 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) { + 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'; + } + } + } + switch (type) { case 0: - if (ft) - goto statically_linked; - ftptr = RSTRING_PTR(tmp); - return rb_feature_p(vm, ftptr, 0, FALSE, TRUE, 0); + if (ft) + goto feature_present; + ftptr = RSTRING_PTR(tmp); + return rb_feature_p(box, ftptr, 0, FALSE, TRUE, 0); default: - if (ft) { - goto statically_linked; - } + if (ft) { + goto feature_present; + } /* fall through */ - case 1: - ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); - if (rb_feature_p(vm, ftptr, ext, !--type, TRUE, &loading) && !loading) - break; - *path = tmp; + case loadable_ext_rb: + ext = strrchr(ftptr = RSTRING_PTR(tmp), '.'); + if (rb_feature_p(box, ftptr, ext, type == loadable_ext_rb, TRUE, &loading) && !loading) + break; + *path = tmp; } - return type ? 's' : 'r'; + return type > loadable_ext_rb ? 's' : 'r'; - statically_linked: + feature_present: if (loading) *path = rb_filesystem_str_new_cstr(loading); return ft; } @@ -1011,29 +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 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 Qtrue; + } + 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': @@ -1050,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; } @@ -1080,21 +1286,25 @@ 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, 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 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; - fname = rb_get_path(fname); path = rb_str_encode_ospath(fname); RUBY_DTRACE_HOOK(REQUIRE_ENTRY, RSTRING_PTR(fname)); saved_path = path; @@ -1103,55 +1313,59 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa ec->errinfo = Qnil; /* ensure */ th->top_wrapper = 0; if ((state = EC_EXEC_TAG()) == TAG_NONE) { - long handle; - int found; + VALUE handle; + int found; - RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, RSTRING_PTR(fname)); - found = search_required(th->vm, path, &saved_path, rb_feature_p); - RUBY_DTRACE_HOOK(FIND_REQUIRE_RETURN, RSTRING_PTR(fname)); + RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, RSTRING_PTR(fname)); + 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))) { - result = 0; - } - else if (!*ftptr) { - result = TAG_RETURN; - } + if (found) { + if (!path || !(ftptr = load_lock(box, RSTRING_PTR(path), warn))) { + result = 0; + } + else if (!*ftptr) { + result = TAG_RETURN; + } + 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, - realpath = rb_realpath_internal(Qnil, path, 1)))) { + realpath = realpath_internal_cached(realpath_map, path)))) { result = 0; } - else { - switch (found) { - case 'r': - load_iseq_eval(ec, path); - break; + else { + switch (found) { + case 'r': + load_iseq_eval(saved.ec, path); + break; - case 's': + case 's': reset_ext_config = true; ext_config_push(th, &prev_ext_config); - handle = (long)rb_vm_call_cfunc(rb_vm_top_self(), load_ext, - path, VM_BLOCK_HANDLER_NONE, path); - rb_ary_push(ruby_dln_librefs, LONG2NUM(handle)); - break; - } + 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; - } - } + } + } } 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) { + if (state == TAG_FATAL || state == TAG_THROW) { EC_JUMP_TAG(ec, state); } else if (exception) { @@ -1164,9 +1378,9 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa else if (state == TAG_RETURN) { return TAG_RAISE; } - RB_GC_GUARD(fname); - /* never TAG_RETURN */ - return state; + RB_GC_GUARD(fname); + /* never TAG_RETURN */ + return state; } if (!NIL_P(ec->errinfo)) { if (!exception) return TAG_RAISE; @@ -1174,10 +1388,11 @@ 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) { - rb_hash_aset(realpaths, rb_fstring(real), Qtrue); + real = rb_fstring(real); + rb_hash_aset(realpaths, real, Qtrue); } } ec->errinfo = saved.errinfo; @@ -1190,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); } @@ -1204,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)); @@ -1215,23 +1434,40 @@ ruby_require_internal(const char *fname, unsigned int len) VALUE rb_require_string(VALUE fname) { + return rb_require_string_internal(FilePathValue(fname), false); +} + +static VALUE +rb_require_string_internal(VALUE fname, bool resurrect) +{ rb_execution_context_t *ec = GET_EC(); - int result = require_internal(ec, fname, 1, RTEST(ruby_verbose)); - if (result > TAG_RETURN) { - EC_JUMP_TAG(ec, result); - } - if (result < 0) { - load_failed(fname); + // main ractor check + if (!rb_ractor_main_p()) { + if (resurrect) fname = rb_str_resurrect(fname); + return rb_ractor_require(fname, false); } + else { + int result = require_internal(ec, fname, 1, RTEST(ruby_verbose)); + + if (result > TAG_RETURN) { + EC_JUMP_TAG(ec, result); + } + if (result < 0) { + if (resurrect) fname = rb_str_resurrect(fname); + load_failed(fname); + } - return RBOOL(result); + return RBOOL(result); + } } VALUE rb_require(const char *fname) { - return rb_require_string(rb_str_new_cstr(fname)); + struct RString fake = {RBASIC_INIT}; + VALUE str = rb_setup_fake_str(&fake, fname, strlen(fname), 0); + return rb_require_string_internal(str, true); } static int @@ -1239,39 +1475,55 @@ register_init_ext(st_data_t *key, st_data_t *value, st_data_t init, int existing { const char *name = (char *)*key; if (existing) { - /* already registered */ - rb_warn("%s is already registered", name); + /* already registered */ + rb_warn("%s is already registered", name); } else { - *value = (st_data_t)MEMO_NEW(0, 0, init); - *key = (st_data_t)ruby_strdup(name); + *value = (st_data_t)init; } return ST_CONTINUE; } -RUBY_FUNC_EXPORTED void +// Private API for statically linked extensions. +// Used with the ext/Setup file, the --with-setup and +// --with-static-linked-ext configuration option, etc. +void ruby_init_ext(const char *name, void (*init)(void)) { + st_table *inits_table; rb_vm_t *vm = GET_VM(); - st_table *loading_tbl = get_loading_table(vm); + const rb_box_t *box = rb_loading_box(); - if (feature_provided(vm, name, 0)) - return; - st_update(loading_tbl, (st_data_t)name, register_init_ext, (st_data_t)init); + 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); } /* * call-seq: - * mod.autoload(module, filename) -> nil + * mod.autoload(const, filename) -> nil * * Registers _filename_ to be loaded (using Kernel::require) - * the first time that _module_ (which may be a String or + * the first time that _const_ (which may be a String or * a symbol) is accessed in the namespace of _mod_. * * module A * end * A.autoload(:B, "b") * A::B.doit # autoloads "b" + * + * If _const_ in _mod_ is defined as autoload, the file name to be + * loaded is replaced with _filename_. If _const_ is defined but not + * as autoload, does nothing. + * + * Files that are currently being loaded must not be registered for + * autoload. */ static VALUE @@ -1318,20 +1570,27 @@ rb_mod_autoload_p(int argc, VALUE *argv, VALUE mod) ID id = rb_check_id(&sym); if (!id) { - return Qnil; + return Qnil; } return rb_autoload_at_p(mod, id, recur); } /* * call-seq: - * autoload(module, filename) -> nil + * autoload(const, filename) -> nil * * Registers _filename_ to be loaded (using Kernel::require) - * the first time that _module_ (which may be a String or + * the first time that _const_ (which may be a String or * a symbol) is accessed. * * autoload(:MyModule, "/usr/local/lib/modules/my_module.rb") + * + * If _const_ is defined as autoload, the file name to be loaded is + * replaced with _filename_. If _const_ is defined but not as + * autoload, does nothing. + * + * Files that are currently being loaded must not be registered for + * autoload. */ static VALUE @@ -1339,7 +1598,7 @@ rb_f_autoload(VALUE obj, VALUE sym, VALUE file) { VALUE klass = rb_class_real(rb_vm_cbase()); if (!klass) { - rb_raise(rb_eTypeError, "Can not set autoload on singleton class"); + rb_raise(rb_eTypeError, "Can not set autoload on singleton class"); } return rb_mod_autoload(klass, sym, file); } @@ -1349,10 +1608,22 @@ rb_f_autoload(VALUE obj, VALUE sym, VALUE file) * autoload?(name, inherit=true) -> String or nil * * Returns _filename_ to be loaded if _name_ is registered as - * +autoload+. + * +autoload+ in the current namespace or one of its ancestors. * * autoload(:B, "b") * autoload?(:B) #=> "b" + * + * module C + * autoload(:D, "d") + * autoload?(:D) #=> "d" + * autoload?(:B) #=> nil + * end + * + * class E + * autoload(:F, "f") + * autoload?(:F) #=> "f" + * autoload?(:B) #=> "b" + * end */ static VALUE @@ -1361,34 +1632,58 @@ rb_f_autoload_p(int argc, VALUE *argv, VALUE obj) /* use rb_vm_cbase() as same as rb_f_autoload. */ VALUE klass = rb_vm_cbase(); if (NIL_P(klass)) { - return Qnil; + return Qnil; } return rb_mod_autoload_p(argc, argv, klass); } +void * +rb_ext_resolve_symbol(const char* fname, const char* symbol) +{ + VALUE handle; + VALUE resolved; + 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)) { + ext = strrchr(fname, '.'); + if (!ext || !IS_SOEXT(ext)) { + rb_str_cat_cstr(fname_str, ".so"); + } + if (rb_feature_p(box, fname, 0, FALSE, FALSE, 0)) { + return dln_symbol(NULL, symbol); + } + return NULL; + } + if (RARRAY_LEN(resolved) != 2 || rb_ary_entry(resolved, 0) != ID2SYM(rb_intern("so"))) { + return NULL; + } + path = rb_ary_entry(resolved, 1); + handle = rb_hash_lookup(box->ruby_dln_libmap, path); + if (NIL_P(handle)) { + return NULL; + } + 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_tmp_new(0); - vm->load_path_snapshot = rb_ary_tmp_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_tmp_new(0); - vm->loaded_features_index = st_init_numtable(); - vm->loaded_features_realpaths = rb_hash_new(); - rb_obj_hide(vm->loaded_features_realpaths); + 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); @@ -1397,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_librefs = rb_ary_tmp_new(0); - rb_gc_register_mark_object(ruby_dln_librefs); } |