h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-26 16:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Move autoloading from a map of path names to a real object autoload_t.

Browse Source 
Moved the various things we can autoload into static objects.
Next step is to make them thread safe.
This commit is contained in:
ridiculousfish
2012-01-23 11:42:41 -08:00
parent 8403aae928
commit 6e8637fbc9
4 changed files with 234 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
function.cpp
View File

@@ -38,6 +38,7 @@
#include "expand.h"
#include "halloc.h"
#include "halloc_util.h"
#include "builtin_scripts.h"
class function_internal_info_t
{
@@ -75,6 +76,9 @@ public:
bool shadows;
};
/* Autoloader for functions */
static autoload_t function_autoloader(L"fish_function_path", internal_function_scripts, sizeof internal_function_scripts / sizeof *internal_function_scripts);
/**
Table containing all functions
*/
@@ -136,10 +140,7 @@ static int load( const wchar_t *name )
UNLOCK_FUNCTIONS();
is_autoload = 1;
res = parse_util_load( name,
L"fish_function_path",
&function_remove,
1 );
res = function_autoloader.load( name, &function_remove, 1 );
is_autoload = was_autoload;
return res;
}
@@ -291,7 +292,7 @@ void function_remove( const wchar_t *name )
*/
if( !is_autoload )
{
parse_util_unload( name, L"fish_function_path", 0 );
function_autoloader.unload( name, 0 );
}
UNLOCK_FUNCTIONS();
}