2011-06-24 21:35:29 -06:00
|
|
|
/*
|
|
|
|
https://github.com/peterix/dfhack
|
|
|
|
Copyright (c) 2009-2011 Petr Mrázek (peterix@gmail.com)
|
|
|
|
|
|
|
|
This software is provided 'as-is', without any express or implied
|
|
|
|
warranty. In no event will the authors be held liable for any
|
|
|
|
damages arising from the use of this software.
|
|
|
|
|
|
|
|
Permission is granted to anyone to use this software for any
|
|
|
|
purpose, including commercial applications, and to alter it and
|
|
|
|
redistribute it freely, subject to the following restrictions:
|
|
|
|
|
|
|
|
1. The origin of this software must not be misrepresented; you must
|
|
|
|
not claim that you wrote the original software. If you use this
|
|
|
|
software in a product, an acknowledgment in the product documentation
|
|
|
|
would be appreciated but is not required.
|
|
|
|
|
|
|
|
2. Altered source versions must be plainly marked as such, and
|
|
|
|
must not be misrepresented as being the original software.
|
|
|
|
|
|
|
|
3. This notice may not be removed or altered from any source
|
|
|
|
distribution.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "Internal.h"
|
2011-12-31 04:48:42 -07:00
|
|
|
#include "Core.h"
|
|
|
|
#include "MemAccess.h"
|
|
|
|
#include "PluginManager.h"
|
2012-03-15 03:01:23 -06:00
|
|
|
#include "RemoteServer.h"
|
2011-12-31 04:48:42 -07:00
|
|
|
#include "Console.h"
|
2012-05-05 11:07:18 -06:00
|
|
|
#include "Types.h"
|
2011-12-30 12:25:50 -07:00
|
|
|
|
2011-12-31 04:48:42 -07:00
|
|
|
#include "DataDefs.h"
|
2012-03-15 03:01:23 -06:00
|
|
|
#include "MiscUtils.h"
|
2011-12-30 12:25:50 -07:00
|
|
|
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
#include "LuaWrapper.h"
|
2012-04-15 09:09:25 -06:00
|
|
|
#include "LuaTools.h"
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
|
2011-06-24 21:35:29 -06:00
|
|
|
using namespace DFHack;
|
|
|
|
|
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
|
|
|
#include <map>
|
|
|
|
using namespace std;
|
|
|
|
|
2011-07-26 21:59:09 -06:00
|
|
|
#include "tinythread.h"
|
|
|
|
using namespace tthread;
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
2011-07-18 08:22:49 -06:00
|
|
|
struct Plugin::RefLock
|
|
|
|
{
|
|
|
|
RefLock()
|
|
|
|
{
|
|
|
|
refcount = 0;
|
2011-07-26 21:59:09 -06:00
|
|
|
wakeup = new condition_variable();
|
|
|
|
mut = new mutex();
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
~RefLock()
|
|
|
|
{
|
2011-07-26 21:59:09 -06:00
|
|
|
delete wakeup;
|
|
|
|
delete mut;
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
void lock()
|
|
|
|
{
|
2011-07-26 21:59:09 -06:00
|
|
|
mut->lock();
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
void unlock()
|
|
|
|
{
|
2011-07-26 21:59:09 -06:00
|
|
|
mut->unlock();
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
void lock_add()
|
|
|
|
{
|
2011-07-26 21:59:09 -06:00
|
|
|
mut->lock();
|
2011-07-18 08:22:49 -06:00
|
|
|
refcount ++;
|
2011-07-26 21:59:09 -06:00
|
|
|
mut->unlock();
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
void lock_sub()
|
|
|
|
{
|
2011-07-26 21:59:09 -06:00
|
|
|
mut->lock();
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
if (--refcount == 0)
|
|
|
|
wakeup->notify_one();
|
2011-07-26 21:59:09 -06:00
|
|
|
mut->unlock();
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
void wait()
|
|
|
|
{
|
|
|
|
while(refcount)
|
|
|
|
{
|
2011-07-26 21:59:09 -06:00
|
|
|
wakeup->wait(*mut);
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
}
|
2011-07-26 21:59:09 -06:00
|
|
|
condition_variable * wakeup;
|
|
|
|
mutex * mut;
|
2011-07-18 08:22:49 -06:00
|
|
|
int refcount;
|
|
|
|
};
|
2012-02-21 10:19:17 -07:00
|
|
|
|
|
|
|
struct Plugin::RefAutolock
|
|
|
|
{
|
|
|
|
RefLock * lock;
|
|
|
|
RefAutolock(RefLock * lck):lock(lck){ lock->lock(); };
|
|
|
|
~RefAutolock(){ lock->unlock(); };
|
|
|
|
};
|
|
|
|
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
struct Plugin::RefAutoinc
|
|
|
|
{
|
|
|
|
RefLock * lock;
|
|
|
|
RefAutoinc(RefLock * lck):lock(lck){ lock->lock_add(); };
|
|
|
|
~RefAutoinc(){ lock->lock_sub(); };
|
|
|
|
};
|
|
|
|
|
2011-07-18 08:22:49 -06:00
|
|
|
Plugin::Plugin(Core * core, const std::string & filepath, const std::string & _filename, PluginManager * pm)
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
2011-07-18 08:22:49 -06:00
|
|
|
filename = filepath;
|
|
|
|
parent = pm;
|
|
|
|
name.reserve(_filename.size());
|
2012-01-31 09:55:38 -07:00
|
|
|
for(size_t i = 0; i < _filename.size();i++)
|
2011-07-18 08:22:49 -06:00
|
|
|
{
|
|
|
|
char ch = _filename[i];
|
|
|
|
if(ch == '.')
|
|
|
|
break;
|
|
|
|
name.append(1,ch);
|
|
|
|
}
|
2011-06-24 21:35:29 -06:00
|
|
|
plugin_lib = 0;
|
|
|
|
plugin_init = 0;
|
|
|
|
plugin_shutdown = 0;
|
|
|
|
plugin_status = 0;
|
2011-06-26 18:13:01 -06:00
|
|
|
plugin_onupdate = 0;
|
2011-12-30 07:12:15 -07:00
|
|
|
plugin_onstatechange = 0;
|
2012-03-15 03:01:23 -06:00
|
|
|
plugin_rpcconnect = 0;
|
2011-07-18 08:22:49 -06:00
|
|
|
state = PS_UNLOADED;
|
|
|
|
access = new RefLock();
|
|
|
|
}
|
|
|
|
|
|
|
|
Plugin::~Plugin()
|
|
|
|
{
|
|
|
|
if(state == PS_LOADED)
|
|
|
|
{
|
2012-03-15 03:01:23 -06:00
|
|
|
unload(Core::getInstance().getConsole());
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
delete access;
|
|
|
|
}
|
|
|
|
|
2012-03-15 03:01:23 -06:00
|
|
|
bool Plugin::load(color_ostream &con)
|
2011-07-18 08:22:49 -06:00
|
|
|
{
|
2012-02-21 10:19:17 -07:00
|
|
|
RefAutolock lock(access);
|
2011-07-18 08:22:49 -06:00
|
|
|
if(state == PS_BROKEN)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else if(state == PS_LOADED)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
DFLibrary * plug = OpenPlugin(filename.c_str());
|
2011-06-24 21:35:29 -06:00
|
|
|
if(!plug)
|
|
|
|
{
|
2011-07-18 08:22:49 -06:00
|
|
|
con.printerr("Can't load plugin %s\n", filename.c_str());
|
|
|
|
state = PS_BROKEN;
|
|
|
|
return false;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
2012-02-21 10:19:17 -07:00
|
|
|
const char ** plug_name =(const char ** ) LookupPlugin(plug, "name");
|
2012-02-29 16:33:11 -07:00
|
|
|
const char ** plug_version =(const char ** ) LookupPlugin(plug, "version");
|
|
|
|
if(!plug_name || !plug_version)
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
2012-02-29 16:33:11 -07:00
|
|
|
con.printerr("Plugin %s has no name or version.\n", filename.c_str());
|
2011-06-24 21:35:29 -06:00
|
|
|
ClosePlugin(plug);
|
2011-07-18 08:22:49 -06:00
|
|
|
state = PS_BROKEN;
|
2012-02-21 10:19:17 -07:00
|
|
|
return false;
|
|
|
|
}
|
2012-02-29 16:33:11 -07:00
|
|
|
if(strcmp(DFHACK_VERSION, *plug_version) != 0)
|
2012-02-21 10:19:17 -07:00
|
|
|
{
|
2012-02-29 16:33:11 -07:00
|
|
|
con.printerr("Plugin %s was not built for this version of DFHack.\n"
|
2012-02-21 10:19:17 -07:00
|
|
|
"Plugin: %s, DFHack: %s\n", *plug_name, *plug_version, DFHACK_VERSION);
|
|
|
|
ClosePlugin(plug);
|
|
|
|
state = PS_BROKEN;
|
2011-07-18 08:22:49 -06:00
|
|
|
return false;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
2012-03-10 04:55:42 -07:00
|
|
|
plugin_init = (command_result (*)(color_ostream &, std::vector <PluginCommand> &)) LookupPlugin(plug, "plugin_init");
|
2011-06-24 21:35:29 -06:00
|
|
|
if(!plugin_init)
|
|
|
|
{
|
2011-07-18 08:22:49 -06:00
|
|
|
con.printerr("Plugin %s has no init function.\n", filename.c_str());
|
2011-06-24 21:35:29 -06:00
|
|
|
ClosePlugin(plug);
|
2011-07-18 08:22:49 -06:00
|
|
|
state = PS_BROKEN;
|
|
|
|
return false;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
2012-03-10 04:55:42 -07:00
|
|
|
plugin_status = (command_result (*)(color_ostream &, std::string &)) LookupPlugin(plug, "plugin_status");
|
|
|
|
plugin_onupdate = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_onupdate");
|
|
|
|
plugin_shutdown = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_shutdown");
|
|
|
|
plugin_onstatechange = (command_result (*)(color_ostream &, state_change_event)) LookupPlugin(plug, "plugin_onstatechange");
|
2012-03-15 03:01:23 -06:00
|
|
|
plugin_rpcconnect = (RPCService* (*)(color_ostream &)) LookupPlugin(plug, "plugin_rpcconnect");
|
2012-06-24 11:52:40 -06:00
|
|
|
plugin_eval_ruby = (command_result (*)(const char*)) LookupPlugin(plug, "plugin_eval_ruby");
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
index_lua(plug);
|
2012-02-21 10:19:17 -07:00
|
|
|
this->name = *plug_name;
|
2011-06-24 21:35:29 -06:00
|
|
|
plugin_lib = plug;
|
2012-03-28 08:47:03 -06:00
|
|
|
commands.clear();
|
2012-03-10 04:55:42 -07:00
|
|
|
if(plugin_init(con,commands) == CR_OK)
|
2011-07-18 08:22:49 -06:00
|
|
|
{
|
|
|
|
state = PS_LOADED;
|
|
|
|
parent->registerCommands(this);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
2011-07-18 08:22:49 -06:00
|
|
|
con.printerr("Plugin %s has failed to initialize properly.\n", filename.c_str());
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
reset_lua();
|
2011-07-18 08:22:49 -06:00
|
|
|
ClosePlugin(plugin_lib);
|
|
|
|
state = PS_BROKEN;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-15 03:01:23 -06:00
|
|
|
bool Plugin::unload(color_ostream &con)
|
2011-07-18 08:22:49 -06:00
|
|
|
{
|
|
|
|
// get the mutex
|
|
|
|
access->lock();
|
|
|
|
// if we are actually loaded
|
|
|
|
if(state == PS_LOADED)
|
|
|
|
{
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
// notify the plugin about an attempt to shutdown
|
|
|
|
if (plugin_onstatechange &&
|
|
|
|
plugin_onstatechange(con, SC_BEGIN_UNLOAD) == CR_NOT_FOUND)
|
|
|
|
{
|
|
|
|
con.printerr("Plugin %s has refused to be unloaded.\n", name.c_str());
|
|
|
|
access->unlock();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// wait for all calls to finish
|
|
|
|
access->wait();
|
2012-03-11 16:07:38 -06:00
|
|
|
// notify plugin about shutdown, if it has a shutdown function
|
|
|
|
command_result cr = CR_OK;
|
|
|
|
if(plugin_shutdown)
|
|
|
|
cr = plugin_shutdown(con);
|
2011-07-18 08:22:49 -06:00
|
|
|
// cleanup...
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
reset_lua();
|
2011-07-18 08:22:49 -06:00
|
|
|
parent->unregisterCommands(this);
|
2012-03-28 08:47:03 -06:00
|
|
|
commands.clear();
|
2011-07-18 08:22:49 -06:00
|
|
|
if(cr == CR_OK)
|
|
|
|
{
|
|
|
|
ClosePlugin(plugin_lib);
|
|
|
|
state = PS_UNLOADED;
|
|
|
|
access->unlock();
|
2011-12-29 05:32:32 -07:00
|
|
|
return true;
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
else
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
2011-07-18 08:22:49 -06:00
|
|
|
con.printerr("Plugin %s has failed to shutdown!\n",name.c_str());
|
|
|
|
state = PS_BROKEN;
|
|
|
|
access->unlock();
|
|
|
|
return false;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
|
|
|
}
|
2011-07-18 08:22:49 -06:00
|
|
|
else if(state == PS_UNLOADED)
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
2011-07-18 08:22:49 -06:00
|
|
|
access->unlock();
|
|
|
|
return true;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
2011-07-18 08:22:49 -06:00
|
|
|
access->unlock();
|
|
|
|
return false;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
|
|
|
|
2012-03-15 03:01:23 -06:00
|
|
|
bool Plugin::reload(color_ostream &out)
|
2011-07-18 08:22:49 -06:00
|
|
|
{
|
|
|
|
if(state != PS_LOADED)
|
|
|
|
return false;
|
2012-03-15 03:01:23 -06:00
|
|
|
if(!unload(out))
|
2011-07-18 08:22:49 -06:00
|
|
|
return false;
|
2012-03-15 03:01:23 -06:00
|
|
|
if(!load(out))
|
2011-07-18 08:22:49 -06:00
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-03-15 03:01:23 -06:00
|
|
|
command_result Plugin::invoke(color_ostream &out, const std::string & command, std::vector <std::string> & parameters)
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
2011-07-18 08:22:49 -06:00
|
|
|
Core & c = Core::getInstance();
|
|
|
|
command_result cr = CR_NOT_IMPLEMENTED;
|
|
|
|
access->lock_add();
|
|
|
|
if(state == PS_LOADED)
|
2011-06-25 00:05:17 -06:00
|
|
|
{
|
2012-01-31 09:55:38 -07:00
|
|
|
for (size_t i = 0; i < commands.size();i++)
|
2011-07-18 08:22:49 -06:00
|
|
|
{
|
2011-12-30 12:25:50 -07:00
|
|
|
PluginCommand &cmd = commands[i];
|
|
|
|
if(cmd.name == command)
|
2011-07-18 08:22:49 -06:00
|
|
|
{
|
2011-08-05 20:37:29 -06:00
|
|
|
// running interactive things from some other source than the console would break it
|
2012-03-15 03:01:23 -06:00
|
|
|
if(!out.is_console() && cmd.interactive)
|
2012-03-16 04:11:46 -06:00
|
|
|
cr = CR_NEEDS_CONSOLE;
|
2011-12-30 12:25:50 -07:00
|
|
|
else if (cmd.guard)
|
|
|
|
{
|
|
|
|
// Execute hotkey commands in a way where they can
|
|
|
|
// expect their guard conditions to be matched,
|
|
|
|
// so as to avoid duplicating checks.
|
|
|
|
// This means suspending the core beforehand.
|
|
|
|
CoreSuspender suspend(&c);
|
|
|
|
df::viewscreen *top = c.getTopViewscreen();
|
|
|
|
|
2012-03-10 04:55:42 -07:00
|
|
|
if (!cmd.guard(top))
|
2011-12-30 12:25:50 -07:00
|
|
|
{
|
2012-03-10 04:55:42 -07:00
|
|
|
out.printerr("Could not invoke %s: unsuitable UI state.\n", command.c_str());
|
2011-12-31 02:25:46 -07:00
|
|
|
cr = CR_WRONG_USAGE;
|
2011-12-30 12:25:50 -07:00
|
|
|
}
|
2011-12-31 02:25:46 -07:00
|
|
|
else
|
2011-12-30 12:25:50 -07:00
|
|
|
{
|
2012-03-10 04:55:42 -07:00
|
|
|
cr = cmd.function(out, parameters);
|
2011-12-30 12:25:50 -07:00
|
|
|
}
|
|
|
|
}
|
2011-08-05 20:37:29 -06:00
|
|
|
else
|
2011-12-30 12:25:50 -07:00
|
|
|
{
|
2012-03-10 04:55:42 -07:00
|
|
|
cr = cmd.function(out, parameters);
|
2011-12-30 12:25:50 -07:00
|
|
|
}
|
2011-12-31 02:25:46 -07:00
|
|
|
if (cr == CR_WRONG_USAGE && !cmd.usage.empty())
|
2012-03-10 04:55:42 -07:00
|
|
|
out << "Usage:\n" << cmd.usage << flush;
|
2011-12-30 12:25:50 -07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
access->lock_sub();
|
|
|
|
return cr;
|
|
|
|
}
|
|
|
|
|
2012-03-15 03:01:23 -06:00
|
|
|
bool Plugin::can_invoke_hotkey(const std::string & command, df::viewscreen *top )
|
2011-12-30 12:25:50 -07:00
|
|
|
{
|
|
|
|
Core & c = Core::getInstance();
|
|
|
|
bool cr = false;
|
|
|
|
access->lock_add();
|
|
|
|
if(state == PS_LOADED)
|
|
|
|
{
|
2012-01-31 09:55:38 -07:00
|
|
|
for (size_t i = 0; i < commands.size();i++)
|
2011-12-30 12:25:50 -07:00
|
|
|
{
|
|
|
|
PluginCommand &cmd = commands[i];
|
|
|
|
if(cmd.name == command)
|
|
|
|
{
|
|
|
|
if (cmd.interactive)
|
|
|
|
cr = false;
|
|
|
|
else if (cmd.guard)
|
2012-03-10 04:55:42 -07:00
|
|
|
cr = cmd.guard(top);
|
2011-12-31 02:25:46 -07:00
|
|
|
else
|
2012-03-10 04:55:42 -07:00
|
|
|
cr = Gui::default_hotkey(top);
|
2011-07-18 08:22:49 -06:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2011-06-25 00:05:17 -06:00
|
|
|
}
|
2011-07-18 08:22:49 -06:00
|
|
|
access->lock_sub();
|
|
|
|
return cr;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
|
|
|
|
2012-03-10 04:55:42 -07:00
|
|
|
command_result Plugin::on_update(color_ostream &out)
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
2011-07-18 08:22:49 -06:00
|
|
|
command_result cr = CR_NOT_IMPLEMENTED;
|
|
|
|
access->lock_add();
|
|
|
|
if(state == PS_LOADED && plugin_onupdate)
|
|
|
|
{
|
2012-03-10 04:55:42 -07:00
|
|
|
cr = plugin_onupdate(out);
|
2012-04-15 09:09:25 -06:00
|
|
|
Lua::Core::Reset(out, "plugin_onupdate");
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
access->lock_sub();
|
|
|
|
return cr;
|
|
|
|
}
|
|
|
|
|
2012-03-10 04:55:42 -07:00
|
|
|
command_result Plugin::on_state_change(color_ostream &out, state_change_event event)
|
2011-12-30 07:12:15 -07:00
|
|
|
{
|
|
|
|
command_result cr = CR_NOT_IMPLEMENTED;
|
|
|
|
access->lock_add();
|
|
|
|
if(state == PS_LOADED && plugin_onstatechange)
|
|
|
|
{
|
2012-03-10 04:55:42 -07:00
|
|
|
cr = plugin_onstatechange(out, event);
|
2012-04-15 09:09:25 -06:00
|
|
|
Lua::Core::Reset(out, "plugin_onstatechange");
|
2011-12-30 07:12:15 -07:00
|
|
|
}
|
|
|
|
access->lock_sub();
|
|
|
|
return cr;
|
|
|
|
}
|
|
|
|
|
2012-03-15 03:01:23 -06:00
|
|
|
RPCService *Plugin::rpc_connect(color_ostream &out)
|
|
|
|
{
|
|
|
|
RPCService *rv = NULL;
|
|
|
|
|
|
|
|
access->lock_add();
|
|
|
|
|
|
|
|
if(state == PS_LOADED && plugin_rpcconnect)
|
|
|
|
{
|
|
|
|
rv = plugin_rpcconnect(out);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rv)
|
|
|
|
{
|
|
|
|
// Retain the access reference
|
|
|
|
assert(!rv->holder);
|
|
|
|
services.push_back(rv);
|
|
|
|
rv->holder = this;
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
access->lock_sub();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Plugin::detach_connection(RPCService *svc)
|
|
|
|
{
|
|
|
|
int idx = linear_index(services, svc);
|
|
|
|
|
|
|
|
assert(svc->holder == this && idx >= 0);
|
|
|
|
|
|
|
|
vector_erase_at(services, idx);
|
|
|
|
access->lock_sub();
|
|
|
|
}
|
|
|
|
|
2011-07-18 08:22:49 -06:00
|
|
|
Plugin::plugin_state Plugin::getState() const
|
|
|
|
{
|
|
|
|
return state;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
|
|
|
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
void Plugin::index_lua(DFLibrary *lib)
|
|
|
|
{
|
|
|
|
if (auto cmdlist = (CommandReg*)LookupPlugin(lib, "plugin_lua_commands"))
|
|
|
|
{
|
|
|
|
for (; cmdlist->name; ++cmdlist)
|
|
|
|
{
|
|
|
|
auto &cmd = lua_commands[cmdlist->name];
|
2012-04-15 09:09:25 -06:00
|
|
|
if (!cmd) cmd = new LuaCommand(this,cmdlist->name);
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
cmd->command = cmdlist->command;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (auto funlist = (FunctionReg*)LookupPlugin(lib, "plugin_lua_functions"))
|
|
|
|
{
|
|
|
|
for (; funlist->name; ++funlist)
|
|
|
|
{
|
|
|
|
auto &cmd = lua_functions[funlist->name];
|
2012-04-15 09:09:25 -06:00
|
|
|
if (!cmd) cmd = new LuaFunction(this,funlist->name);
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
cmd->identity = funlist->identity;
|
|
|
|
}
|
|
|
|
}
|
2012-04-15 09:09:25 -06:00
|
|
|
if (auto evlist = (EventReg*)LookupPlugin(lib, "plugin_lua_events"))
|
|
|
|
{
|
|
|
|
for (; evlist->name; ++evlist)
|
|
|
|
{
|
|
|
|
auto &cmd = lua_events[evlist->name];
|
|
|
|
if (!cmd) cmd = new LuaEvent(this,evlist->name);
|
|
|
|
cmd->handler.identity = evlist->event->get_handler();
|
|
|
|
cmd->event = evlist->event;
|
|
|
|
if (cmd->active)
|
|
|
|
cmd->event->bind(Lua::Core::State, cmd);
|
|
|
|
}
|
|
|
|
}
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void Plugin::reset_lua()
|
|
|
|
{
|
|
|
|
for (auto it = lua_commands.begin(); it != lua_commands.end(); ++it)
|
|
|
|
it->second->command = NULL;
|
|
|
|
for (auto it = lua_functions.begin(); it != lua_functions.end(); ++it)
|
|
|
|
it->second->identity = NULL;
|
2012-04-15 09:09:25 -06:00
|
|
|
for (auto it = lua_events.begin(); it != lua_events.end(); ++it)
|
|
|
|
{
|
|
|
|
it->second->handler.identity = NULL;
|
|
|
|
it->second->event = NULL;
|
|
|
|
}
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
int Plugin::lua_cmd_wrapper(lua_State *state)
|
|
|
|
{
|
|
|
|
auto cmd = (LuaCommand*)lua_touserdata(state, lua_upvalueindex(1));
|
|
|
|
|
|
|
|
RefAutoinc lock(cmd->owner->access);
|
|
|
|
|
|
|
|
if (!cmd->command)
|
|
|
|
luaL_error(state, "plugin command %s() has been unloaded",
|
|
|
|
(cmd->owner->name+"."+cmd->name).c_str());
|
|
|
|
|
|
|
|
return cmd->command(state);
|
|
|
|
}
|
|
|
|
|
|
|
|
int Plugin::lua_fun_wrapper(lua_State *state)
|
|
|
|
{
|
|
|
|
auto cmd = (LuaFunction*)lua_touserdata(state, UPVAL_CONTAINER_ID);
|
|
|
|
|
|
|
|
RefAutoinc lock(cmd->owner->access);
|
|
|
|
|
|
|
|
if (!cmd->identity)
|
|
|
|
luaL_error(state, "plugin function %s() has been unloaded",
|
|
|
|
(cmd->owner->name+"."+cmd->name).c_str());
|
|
|
|
|
|
|
|
return LuaWrapper::method_wrapper_core(state, cmd->identity);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Plugin::open_lua(lua_State *state, int table)
|
|
|
|
{
|
|
|
|
table = lua_absindex(state, table);
|
|
|
|
|
|
|
|
RefAutolock lock(access);
|
|
|
|
|
|
|
|
for (auto it = lua_commands.begin(); it != lua_commands.end(); ++it)
|
|
|
|
{
|
|
|
|
lua_pushlightuserdata(state, it->second);
|
|
|
|
lua_pushcclosure(state, lua_cmd_wrapper, 1);
|
|
|
|
lua_setfield(state, table, it->first.c_str());
|
|
|
|
}
|
|
|
|
|
|
|
|
for (auto it = lua_functions.begin(); it != lua_functions.end(); ++it)
|
|
|
|
{
|
2012-04-15 09:09:25 -06:00
|
|
|
push_function(state, it->second);
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
lua_setfield(state, table, it->first.c_str());
|
|
|
|
}
|
2012-04-15 09:09:25 -06:00
|
|
|
|
|
|
|
if (Lua::IsCoreContext(state))
|
|
|
|
{
|
|
|
|
for (auto it = lua_events.begin(); it != lua_events.end(); ++it)
|
|
|
|
{
|
2012-04-16 00:59:55 -06:00
|
|
|
Lua::MakeEvent(state, it->second);
|
2012-04-15 09:09:25 -06:00
|
|
|
|
|
|
|
push_function(state, &it->second->handler);
|
|
|
|
lua_rawsetp(state, -2, NULL);
|
|
|
|
|
|
|
|
it->second->active = true;
|
|
|
|
if (it->second->event)
|
|
|
|
it->second->event->bind(state, it->second);
|
|
|
|
|
|
|
|
lua_setfield(state, table, it->first.c_str());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Plugin::push_function(lua_State *state, LuaFunction *fn)
|
|
|
|
{
|
|
|
|
lua_rawgetp(state, LUA_REGISTRYINDEX, &LuaWrapper::DFHACK_TYPETABLE_TOKEN);
|
|
|
|
lua_pushlightuserdata(state, NULL);
|
|
|
|
lua_pushfstring(state, "%s.%s()", name.c_str(), fn->name.c_str());
|
|
|
|
lua_pushlightuserdata(state, fn);
|
|
|
|
lua_pushcclosure(state, lua_fun_wrapper, 4);
|
Allow plugins to export functions to lua with safe reload support.
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 09:44:07 -06:00
|
|
|
}
|
|
|
|
|
2011-06-24 21:35:29 -06:00
|
|
|
PluginManager::PluginManager(Core * core)
|
|
|
|
{
|
|
|
|
#ifdef LINUX_BUILD
|
2012-05-04 09:47:18 -06:00
|
|
|
string path = core->getHackPath() + "plugins/";
|
2011-06-24 21:35:29 -06:00
|
|
|
const string searchstr = ".plug.so";
|
|
|
|
#else
|
2012-05-04 09:47:18 -06:00
|
|
|
string path = core->getHackPath() + "plugins\\";
|
2011-06-24 21:35:29 -06:00
|
|
|
const string searchstr = ".plug.dll";
|
|
|
|
#endif
|
2011-07-26 21:59:09 -06:00
|
|
|
cmdlist_mutex = new mutex();
|
2012-06-24 11:52:40 -06:00
|
|
|
eval_ruby = NULL;
|
2011-06-24 21:35:29 -06:00
|
|
|
vector <string> filez;
|
|
|
|
getdir(path, filez);
|
2012-01-31 09:55:38 -07:00
|
|
|
for(size_t i = 0; i < filez.size();i++)
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
|
|
|
if(hasEnding(filez[i],searchstr))
|
|
|
|
{
|
2011-07-18 08:22:49 -06:00
|
|
|
Plugin * p = new Plugin(core, path + filez[i], filez[i], this);
|
2011-06-24 21:35:29 -06:00
|
|
|
all_plugins.push_back(p);
|
2011-07-20 12:58:19 -06:00
|
|
|
// make all plugins load by default (until a proper design emerges).
|
2012-03-15 03:01:23 -06:00
|
|
|
p->load(core->getConsole());
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
PluginManager::~PluginManager()
|
|
|
|
{
|
2012-01-31 09:55:38 -07:00
|
|
|
for(size_t i = 0; i < all_plugins.size();i++)
|
2011-06-25 00:05:17 -06:00
|
|
|
{
|
|
|
|
delete all_plugins[i];
|
|
|
|
}
|
|
|
|
all_plugins.clear();
|
2011-07-26 21:59:09 -06:00
|
|
|
delete cmdlist_mutex;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
2011-06-25 00:05:17 -06:00
|
|
|
|
2011-07-18 08:22:49 -06:00
|
|
|
Plugin *PluginManager::getPluginByName (const std::string & name)
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
2012-01-31 09:55:38 -07:00
|
|
|
for(size_t i = 0; i < all_plugins.size(); i++)
|
2011-06-25 00:05:17 -06:00
|
|
|
{
|
|
|
|
if(name == all_plugins[i]->name)
|
|
|
|
return all_plugins[i];
|
|
|
|
}
|
|
|
|
return 0;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
2011-06-25 00:05:17 -06:00
|
|
|
|
2011-12-30 12:25:50 -07:00
|
|
|
Plugin *PluginManager::getPluginByCommand(const std::string &command)
|
|
|
|
{
|
|
|
|
tthread::lock_guard<tthread::mutex> lock(*cmdlist_mutex);
|
|
|
|
map <string, Plugin *>::iterator iter = belongs.find(command);
|
|
|
|
if (iter != belongs.end())
|
|
|
|
return iter->second;
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-06-25 00:05:17 -06:00
|
|
|
// FIXME: handle name collisions...
|
2012-03-15 03:01:23 -06:00
|
|
|
command_result PluginManager::InvokeCommand(color_ostream &out, const std::string & command, std::vector <std::string> & parameters)
|
2011-06-24 21:35:29 -06:00
|
|
|
{
|
2011-12-30 12:25:50 -07:00
|
|
|
Plugin *plugin = getPluginByCommand(command);
|
2012-03-15 03:01:23 -06:00
|
|
|
return plugin ? plugin->invoke(out, command, parameters) : CR_NOT_IMPLEMENTED;
|
2011-12-30 12:25:50 -07:00
|
|
|
}
|
|
|
|
|
2012-03-15 03:01:23 -06:00
|
|
|
bool PluginManager::CanInvokeHotkey(const std::string &command, df::viewscreen *top)
|
2011-12-30 12:25:50 -07:00
|
|
|
{
|
|
|
|
Plugin *plugin = getPluginByCommand(command);
|
2012-05-04 10:59:06 -06:00
|
|
|
return plugin ? plugin->can_invoke_hotkey(command, top) : true;
|
2011-06-24 21:35:29 -06:00
|
|
|
}
|
2011-06-26 18:13:01 -06:00
|
|
|
|
2012-03-10 04:55:42 -07:00
|
|
|
void PluginManager::OnUpdate(color_ostream &out)
|
2011-06-26 18:13:01 -06:00
|
|
|
{
|
2012-01-31 09:55:38 -07:00
|
|
|
for(size_t i = 0; i < all_plugins.size(); i++)
|
2011-06-26 18:13:01 -06:00
|
|
|
{
|
2012-03-10 04:55:42 -07:00
|
|
|
all_plugins[i]->on_update(out);
|
2011-07-18 08:22:49 -06:00
|
|
|
}
|
|
|
|
}
|
2011-12-30 07:12:15 -07:00
|
|
|
|
2012-03-10 04:55:42 -07:00
|
|
|
void PluginManager::OnStateChange(color_ostream &out, state_change_event event)
|
2011-12-30 07:12:15 -07:00
|
|
|
{
|
2012-01-31 09:55:38 -07:00
|
|
|
for(size_t i = 0; i < all_plugins.size(); i++)
|
2011-12-30 07:12:15 -07:00
|
|
|
{
|
2012-03-10 04:55:42 -07:00
|
|
|
all_plugins[i]->on_state_change(out, event);
|
2011-12-30 07:12:15 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-18 08:22:49 -06:00
|
|
|
// FIXME: doesn't check name collisions!
|
|
|
|
void PluginManager::registerCommands( Plugin * p )
|
|
|
|
{
|
2011-07-26 21:59:09 -06:00
|
|
|
cmdlist_mutex->lock();
|
2011-07-18 08:22:49 -06:00
|
|
|
vector <PluginCommand> & cmds = p->commands;
|
2012-01-31 09:55:38 -07:00
|
|
|
for(size_t i = 0; i < cmds.size();i++)
|
2011-07-18 08:22:49 -06:00
|
|
|
{
|
|
|
|
belongs[cmds[i].name] = p;
|
2011-06-26 18:13:01 -06:00
|
|
|
}
|
2012-06-24 11:52:40 -06:00
|
|
|
if (p->plugin_eval_ruby)
|
|
|
|
eval_ruby = p->plugin_eval_ruby;
|
2011-07-26 21:59:09 -06:00
|
|
|
cmdlist_mutex->unlock();
|
2011-06-26 18:13:01 -06:00
|
|
|
}
|
2011-07-18 08:22:49 -06:00
|
|
|
|
|
|
|
// FIXME: doesn't check name collisions!
|
|
|
|
void PluginManager::unregisterCommands( Plugin * p )
|
|
|
|
{
|
2011-07-26 21:59:09 -06:00
|
|
|
cmdlist_mutex->lock();
|
2011-07-18 08:22:49 -06:00
|
|
|
vector <PluginCommand> & cmds = p->commands;
|
2012-01-31 09:55:38 -07:00
|
|
|
for(size_t i = 0; i < cmds.size();i++)
|
2011-07-18 08:22:49 -06:00
|
|
|
{
|
|
|
|
belongs.erase(cmds[i].name);
|
|
|
|
}
|
2012-06-24 11:52:40 -06:00
|
|
|
if (p->plugin_eval_ruby)
|
|
|
|
eval_ruby = NULL;
|
2011-07-26 21:59:09 -06:00
|
|
|
cmdlist_mutex->unlock();
|
2012-06-24 11:52:40 -06:00
|
|
|
}
|