Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for issue where we treated all cached files as accessible for the purpose of highlighting, instead of using their cached accessible variable

Browse source
This commit is contained in:
ridiculousfish 2012-01-28 15:49:50 -08:00
parent 4eea68b5a4
commit 9b37bc667f
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
autoload.cpp
View file

@ -263,30 +263,6 @@ void autoload_t::unload_all(void) {
this->evict_all_nodes(); this->evict_all_nodes();
} }
bool autoload_t::file_already_autoloaded(const wcstring &cmd, bool require_loaded, bool allow_stale_functions) {
bool result = false;
/* Take a lock */
scoped_lock locker(lock);
/* Get the function */
autoload_function_t * func = this->get_node(cmd);
if (func != NULL) {
if (require_loaded && ! func->is_loaded) {
/* If the function is not loaded, and we're only interested in loaded functions, return false */
result = false;
} else if (! allow_stale_functions && time(NULL) - func->access.last_checked > kAutoloadStalenessInterval) {
/* If the function is stale, and we are not interested in stale functions, we return false */
result = false;
} else {
/* Success */
result = true;
}
}
return result;
}
/** /**
This internal helper function does all the real work. By using two This internal helper function does all the real work. By using two
functions, the internal function can return on various places in functions, the internal function can return on various places in
@ -305,11 +281,37 @@ bool autoload_t::locate_file_and_maybe_load_it( const wcstring &cmd, bool really
size_t i; size_t i;
bool reloaded = 0; bool reloaded = 0;
/* Return if the file is already loaded. If we really want the function to be loaded, require that it be really loaded. If we're not reloading, allow stale functions. */ /* Try using a cached function. If we really want the function to be loaded, require that it be really loaded. If we're not reloading, allow stale functions. */
if (file_already_autoloaded(cmd, really_load, ! reload)) { {
return true; bool allow_stale_functions = ! reload;
}
/* Take a lock */
scoped_lock locker(lock);
/* Get the function */
autoload_function_t * func = this->get_node(cmd);
/* Determine if we can use this cached function */
bool use_cached;
if (! func) {
/* Can't use a function that doesn't exist */
use_cached = false;
} else if ( ! allow_stale_functions && time(NULL) - func->access.last_checked > kAutoloadStalenessInterval) {
/* Can't use a stale function */
use_cached = false;
} else if (really_load && ! func->is_loaded) {
/* Can't use an unloaded function */
use_cached = false;
} else {
/* I guess we can use it */
use_cached = true;
}
/* If we can use this function, return whether we were able to access it */
if (use_cached) {
return func->access.accessible;
}
}
/* The source of the script will end up here */ /* The source of the script will end up here */
wcstring script_source; wcstring script_source;
bool has_script_source = false; bool has_script_source = false;

2
autoload.h
View file

@ -144,8 +144,6 @@ private:
void remove_all_functions(void) { void remove_all_functions(void) {
this->evict_all_nodes(); this->evict_all_nodes();
} }
bool file_already_autoloaded(const wcstring &cmd, bool require_loaded, bool allow_stale_functions);
bool locate_file_and_maybe_load_it( const wcstring &cmd, bool really_load, bool reload, const wcstring_list_t &path_list ); bool locate_file_and_maybe_load_it( const wcstring &cmd, bool really_load, bool reload, const wcstring_list_t &path_list );