Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-27 20:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for problem where we'd never use a cached placeholder function. Also upped the staleness interval from its testing value of 1 to 15 seconds.

Browse source
This commit is contained in:
ridiculousfish 2012-02-13 10:28:04 -08:00
parent dce189fc6d
commit b39bebee06
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
autoload.cpp
View file

@ -15,7 +15,7 @@ The classes responsible for autoloading functions and completions.
#include <algorithm> #include <algorithm>
/* The time before we'll recheck an autoloaded file */ /* The time before we'll recheck an autoloaded file */
static const int kAutoloadStalenessInterval = 1; static const int kAutoloadStalenessInterval = 15;
file_access_attempt_t access_file(const wcstring &path, int mode) { file_access_attempt_t access_file(const wcstring &path, int mode) {
file_access_attempt_t result = {0}; file_access_attempt_t result = {0};
@ -67,7 +67,6 @@ int autoload_t::unload( const wcstring &cmd )
int autoload_t::load( const wcstring &cmd, bool reload ) int autoload_t::load( const wcstring &cmd, bool reload )
{ {
int res; int res;
CHECK_BLOCK( 0 ); CHECK_BLOCK( 0 );
ASSERT_IS_MAIN_THREAD(); ASSERT_IS_MAIN_THREAD();
@ -108,7 +107,6 @@ int autoload_t::load( const wcstring &cmd, bool reload )
/* Mark that we're loading this */ /* Mark that we're loading this */
is_loading_set.insert(cmd); is_loading_set.insert(cmd);
/* Get the list of paths from which we will try to load */ /* Get the list of paths from which we will try to load */
std::vector<wcstring> path_list; std::vector<wcstring> path_list;
tokenize_variable_array( path_var, path_list ); tokenize_variable_array( path_var, path_list );
@ -181,7 +179,7 @@ bool autoload_t::locate_file_and_maybe_load_it( const wcstring &cmd, bool really
} else if ( ! allow_stale_functions && time(NULL) - func->access.last_checked > kAutoloadStalenessInterval) { } else if ( ! allow_stale_functions && time(NULL) - func->access.last_checked > kAutoloadStalenessInterval) {
/* Can't use a stale function */ /* Can't use a stale function */
use_cached = false; use_cached = false;
} else if (really_load && ! func->is_loaded) { } else if (really_load && ! func->is_placeholder && ! func->is_loaded) {
/* Can't use an unloaded function */ /* Can't use an unloaded function */
use_cached = false; use_cached = false;
} else { } else {