Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tombstone only when explicitly removing a function.

Browse source 
Do not tombstone a function when it is evicted normally from the LRU cache.
This broke changing `fish_function_path`, since that would evict all nodes,
resulting in accidental tombstones, which caused autoloaded functions to
never be reloaded.

See #213.
This commit is contained in:
Sanne Wouda 2015-04-08 11:58:29 +02:00 committed by ridiculousfish
parent 97aa1c033b
commit fbe28fd5d8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
function.cpp
View file

@ -66,12 +66,12 @@ function_autoload_t::function_autoload_t() : autoload_t(L"fish_function_path", N
{ {
} }
static bool function_remove_ignore_autoload(const wcstring &name); static bool function_remove_ignore_autoload(const wcstring &name, bool tombstone = true);
/** Callback when an autoloaded function is removed */ /** Callback when an autoloaded function is removed */
void function_autoload_t::command_removed(const wcstring &cmd) void function_autoload_t::command_removed(const wcstring &cmd)
{ {
function_remove_ignore_autoload(cmd); function_remove_ignore_autoload(cmd, false);
} }
/** /**
@ -237,7 +237,7 @@ int function_exists_no_autoload(const wcstring &cmd, const env_vars_snapshot_t &
return loaded_functions.find(cmd) != loaded_functions.end() || function_autoloader.can_load(cmd, vars); return loaded_functions.find(cmd) != loaded_functions.end() || function_autoloader.can_load(cmd, vars);
} }
static bool function_remove_ignore_autoload(const wcstring &name) static bool function_remove_ignore_autoload(const wcstring &name, bool tombstone)
{ {
// Note: the lock may be held at this point, but is recursive // Note: the lock may be held at this point, but is recursive
scoped_lock lock(functions_lock); scoped_lock lock(functions_lock);
@ -250,7 +250,7 @@ static bool function_remove_ignore_autoload(const wcstring &name)
// removing an auto-loaded function. prevent it from being // removing an auto-loaded function. prevent it from being
// auto-reloaded. // auto-reloaded.
if (iter->second.is_autoload) if (iter->second.is_autoload && tombstone)
function_tombstones.insert(name); function_tombstones.insert(name);
loaded_functions.erase(iter); loaded_functions.erase(iter);