MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve some plugin-related error handling

develop
lethosor 2015-08-16 17:28:31 -04:00
parent 5717c2cdd4
commit 19f966aefc
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/PluginManager.cpp
Unescape Escape View File

@ -248,21 +248,22 @@ bool Plugin::load(color_ostream &con)
CoreSuspender suspend; CoreSuspender suspend;
// open the library, etc // open the library, etc
fprintf(stderr, "loading plugin %s\n", name.c_str()); fprintf(stderr, "loading plugin %s\n", name.c_str());
DFLibrary * plug = OpenPlugin(path.c_str());
if(!plug)
{
RefAutolock lock(access);
if (!Filesystem::isfile(path)) if (!Filesystem::isfile(path))
{ {
con.printerr("Plugin %s does not exist on disk\n", name.c_str()); con.printerr("Plugin %s does not exist on disk\n", name.c_str());
RefAutolock lock(access);
state = PS_DELETED; state = PS_DELETED;
return false; return false;
} }
DFLibrary * plug = OpenPlugin(path.c_str()); else {
if(!plug)
{
con.printerr("Can't load plugin %s\n", name.c_str()); con.printerr("Can't load plugin %s\n", name.c_str());
RefAutolock lock(access);
state = PS_UNLOADED; state = PS_UNLOADED;
return false; return false;
} }
}
#define plugin_abort_load ClosePlugin(plug); RefAutolock lock(access); state = PS_UNLOADED #define plugin_abort_load ClosePlugin(plug); RefAutolock lock(access); state = PS_UNLOADED
#define plugin_check_symbol(sym) \ #define plugin_check_symbol(sym) \
if (!LookupPlugin(plug, sym)) \ if (!LookupPlugin(plug, sym)) \
@ -869,7 +870,7 @@ bool PluginManager::load (const string &name)
Plugin *p = (*this)[name]; Plugin *p = (*this)[name];
if (!p) if (!p)
{ {
Core::printerr("Plugin failed to load: %s\n", name.c_str()); Core::printerr("Plugin failed to register: %s\n", name.c_str());
return false; return false;
} }
return p->load(core->getConsole()); return p->load(core->getConsole());
@ -981,7 +982,6 @@ void PluginManager::OnStateChange(color_ostream &out, state_change_event event)
it->second->on_state_change(out, event); it->second->on_state_change(out, event);
} }
// FIXME: doesn't check name collisions!
void PluginManager::registerCommands( Plugin * p ) void PluginManager::registerCommands( Plugin * p )
{ {
cmdlist_mutex->lock(); cmdlist_mutex->lock();
@ -991,8 +991,9 @@ void PluginManager::registerCommands( Plugin * p )
std::string name = cmds[i].name; std::string name = cmds[i].name;
if (command_map.find(name) != command_map.end()) if (command_map.find(name) != command_map.end())
{ {
fprintf(stderr, "Plugin %s re-implements command \"%s\" (from plugin %s)\n", core->printerr("Plugin %s re-implements command \"%s\" (from plugin %s)\n",
p->getName().c_str(), name.c_str(), command_map[name]->getName().c_str()); p->getName().c_str(), name.c_str(), command_map[name]->getName().c_str());
continue;
} }
command_map[name] = p; command_map[name] = p;
} }
@ -1001,7 +1002,6 @@ void PluginManager::registerCommands( Plugin * p )
cmdlist_mutex->unlock(); cmdlist_mutex->unlock();
} }
// FIXME: doesn't check name collisions!
void PluginManager::unregisterCommands( Plugin * p ) void PluginManager::unregisterCommands( Plugin * p )
{ {
cmdlist_mutex->lock(); cmdlist_mutex->lock();