Skip to content

require() resolution cache #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tmm1 wants to merge 7 commits into from
Closed

require() resolution cache #25

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d02be5
add REQUIRE_CACHE_{READ_WRITE} env vars
tmm1 Feb 11, 2015
25e98f7
cache lookup failures too
tmm1 Feb 11, 2015
bbbca3c
clear out REQUIRE_CACHE_WRITE for any subprocesses
tmm1 Feb 12, 2015
c9721f4
change debug msg
tmm1 Feb 12, 2015
1089cf1
use st_lookup instead of st_delete, and emulate search_required behavior
tmm1 Feb 12, 2015
8afbab4
short circuit require("enumerator")
tmm1 Mar 6, 2015
faa994c
ignore READ variable in WRITE mode
tmm1 Mar 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use st_lookup instead of st_delete, and emulate search_required behavior
  • Loading branch information
@tmm1
tmm1 committed Feb 12, 2015
commit 1089cf1f707ca22c5fb7ad53271e5aafc89994bc
4 changes: 2 additions & 2 deletions load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,14 +980,14 @@ rb_require_safe(VALUE fname, int safe)
ipath = rb_str_encode_ospath(fname);
if (vm->require_cache.read && RSTRING_PTR(ipath)[0] != '/') {
key = (st_data_t)RSTRING_PTR(ipath);
if (st_delete(vm->require_cache.tbl, &key, &val)) {
if (st_lookup(vm->require_cache.tbl, key, &val)) {
vals = (char *)val;
found = vals[0];
if (found) {
/*fprintf(stderr, "FOUND '%s' => '%s'\n", (char *)key, vals);*/
path = rb_str_new_cstr(vals+1);
vals[1] = 0;
}
xfree(vals);
} else {
found = search_required(ipath, &path, safe);
/*if (found && path)
Expand Down