Skip to content

Commit

Permalink
automatically search cache modules when calling require(::Symbol) or …
Browse files Browse the repository at this point in the history 
…using/import
  • Loading branch information
@vtjnash
vtjnash committed Jul 17, 2015
1 parent 3c3f46d commit aacf7d3
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 24 deletions.
3 changes: 3 additions & 0 deletions base/client.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,16 @@ is_interactive = false
isinteractive() = (is_interactive::Bool)

const LOAD_PATH = ByteString[]
const LOAD_CACHE_PATH = ByteString[]
function init_load_path()
vers = "v$(VERSION.major).$(VERSION.minor)"
if haskey(ENV,"JULIA_LOAD_PATH")
prepend!(LOAD_PATH, split(ENV["JULIA_LOAD_PATH"], @windows? ';' : ':'))
end
push!(LOAD_PATH,abspath(JULIA_HOME,"..","local","share","julia","site",vers))
push!(LOAD_PATH,abspath(JULIA_HOME,"..","share","julia","site",vers))
push!(LOAD_CACHE_PATH,abspath(homedir(),".julia",".libs"))
push!(LOAD_CACHE_PATH,abspath(JULIA_HOME,"..","usr","lib","julia")) #TODO: fixme

This comment has been minimized.

Sign in to view

Copy link
@tkelman

tkelman Feb 7, 2016

Contributor

so, this has never been right... should we think about this todo, or just delete this line?
end

function load_juliarc()
Expand Down
29 changes: 29 additions & 0 deletions base/loading.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,35 @@ require(f::AbstractString, fs::AbstractString...) = (require(f); for x in fs req
# only broadcast top-level (not nested) requires and reloads
toplevel_load = true

function _require_from_serialized(content)
m = ccall(:jl_restore_new_module_from_buf, UInt, (Ptr{Uint8},Int), content, sizeof(content))
#package_list[path] = time()
return m
end

function require(sname::Symbol)
name = string(sname)
for prefix in LOAD_CACHE_PATH
path = joinpath(prefix, name*".ji")
if isfile(path)
if nprocs() == 1
if ccall(:jl_restore_new_module, UInt, (Ptr{Uint8},), path) != 0
#package_list[path] = time()
return
end
else
content = open(readbytes, path)
if _require_from_serialized(content) != 0
refs = Any[ @spawnat p _require_from_serialized(content) for p in filter(x->x!=1, procs()) ]
for r in refs; wait(r); end
return
end
end
end
end
require(name)
end

function require(name::AbstractString)
path = find_in_node1_path(name)
path == nothing && throw(ArgumentError("$name not found in path"))
Expand Down
66 changes: 46 additions & 20 deletions src/dump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1423,17 +1423,31 @@ int jl_deserialize_verify_mod_list(ios_t *s)
ios_read(s, name, len);
name[len] = '\0';
uint64_t uuid = read_uint64(s);
jl_module_t *m = (jl_module_t*)jl_get_global(jl_main_module, jl_symbol(name));
jl_sym_t *sym = jl_symbol(name);
jl_module_t *m = (jl_module_t*)jl_get_global(jl_main_module, sym);
if (!m) {
jl_printf(JL_STDERR, "error: Module %s must be loaded first\n", name);
static jl_value_t *require_func = NULL;
if (!require_func)
require_func = jl_get_global(jl_base_module, jl_symbol("require"));
JL_TRY {
jl_apply((jl_function_t*)require_func, (jl_value_t**)&sym, 1);
}
JL_CATCH {
ios_close(s);
jl_rethrow();
}
m = (jl_module_t*)jl_get_global(jl_main_module, sym);
}
if (!m) {
jl_printf(JL_STDERR, "error: requiring \"%s\" did not define a corresponding module\n", name);
return 0;
}
if (!jl_is_module(m)) {
ios_close(s);
jl_errorf("typeassert: expected %s::Module", name);
jl_errorf("invalid module path (%s does not name a module)", name);
}
if (m->uuid != uuid) {
jl_printf(JL_STDERR, "error: Module %s uuid did not match cache file\n", name);
jl_printf(JL_STDERR, "warning: Module %s uuid did not match cache file\n", name);
return 0;
}
}
Expand Down Expand Up @@ -1790,19 +1804,14 @@ DLLEXPORT int jl_save_new_module(const char *fname, jl_module_t *mod)
jl_function_t *jl_method_cache_insert(jl_methtable_t *mt, jl_tupletype_t *type,
jl_function_t *method);

DLLEXPORT jl_module_t *jl_restore_new_module(const char *fname)
static jl_module_t *_jl_restore_new_module(ios_t *f)
{
ios_t f;
if (ios_file(&f, fname, 1, 0, 0, 0) == NULL) {
jl_printf(JL_STDERR, "Cache file \"%s\" not found\n", fname);
if (ios_eof(f)) {
ios_close(f);
return NULL;
}
if (ios_eof(&f)) {
ios_close(&f);
return NULL;
}
if (!jl_deserialize_verify_mod_list(&f)) {
ios_close(&f);
if (!jl_deserialize_verify_mod_list(f)) {
ios_close(f);
return NULL;
}
arraylist_new(&backref_list, 4000);
Expand All @@ -1813,14 +1822,14 @@ DLLEXPORT jl_module_t *jl_restore_new_module(const char *fname)
int en = jl_gc_enable(0);
DUMP_MODES last_mode = mode;
mode = MODE_MODULE;
jl_module_t *parent = (jl_module_t*)jl_deserialize_value(&f, NULL);
jl_sym_t *name = (jl_sym_t*)jl_deserialize_value(&f, NULL);
jl_module_t *parent = (jl_module_t*)jl_deserialize_value(f, NULL);
jl_sym_t *name = (jl_sym_t*)jl_deserialize_value(f, NULL);
jl_binding_t *b = jl_get_binding_wr(parent, name);
jl_declare_constant(b);
if (b->value != NULL) {
jl_printf(JL_STDERR, "Warning: replacing module %s\n", name->name);
}
b->value = jl_deserialize_value(&f, &b->value);
b->value = jl_deserialize_value(f, &b->value);

size_t i = 0;
while (i < flagref_list.len) {
Expand Down Expand Up @@ -1882,9 +1891,9 @@ DLLEXPORT jl_module_t *jl_restore_new_module(const char *fname)
}

mode = MODE_MODULE_LAMBDAS;
jl_deserialize_lambdas_from_mod(&f);
jl_deserialize_lambdas_from_mod(f);

jl_module_init_order = (jl_array_t*)jl_deserialize_value(&f, NULL);
jl_module_init_order = (jl_array_t*)jl_deserialize_value(f, NULL);

for (i = 0; i < methtable_list.len; i++) {
jl_methtable_t *mt = (jl_methtable_t*)methtable_list.items[i];
Expand Down Expand Up @@ -1921,13 +1930,30 @@ DLLEXPORT jl_module_t *jl_restore_new_module(const char *fname)
arraylist_free(&flagref_list);
arraylist_free(&methtable_list);
arraylist_free(&backref_list);
ios_close(&f);
ios_close(f);

jl_init_restored_modules();

return (jl_module_t*)b->value;
}

DLLEXPORT jl_module_t *jl_restore_new_module_from_buf(const char *buf, size_t sz)
{
ios_t f;
ios_static_buffer(&f, (char*)buf, sz);
return _jl_restore_new_module(&f);
}

DLLEXPORT jl_module_t *jl_restore_new_module(const char *fname)
{
ios_t f;
if (ios_file(&f, fname, 1, 0, 0, 0) == NULL) {
jl_printf(JL_STDERR, "Cache file \"%s\" not found\n", fname);
return NULL;
}
return _jl_restore_new_module(&f);
}

// --- init ---

void jl_init_serializer(void)
Expand Down
5 changes: 1 addition & 4 deletions src/toplevel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,7 @@ static jl_module_t *eval_import_path_(jl_array_t *args, int retrying)
if (require_func == NULL && jl_base_module != NULL)
require_func = jl_get_global(jl_base_module, jl_symbol("require"));
if (require_func != NULL) {
jl_value_t *str = jl_cstr_to_string(var->name);
JL_GC_PUSH1(&str);
jl_apply((jl_function_t*)require_func, &str, 1);
JL_GC_POP();
jl_apply((jl_function_t*)require_func, (jl_value_t**)&var, 1);
return eval_import_path_(args, 1);
}
}
Expand Down

0 comments on commit aacf7d3

Please sign in to comment.