Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 00:28:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Scripting: Disable lua coroutines

Browse Source
This commit is contained in:
Michael du Breuil 2018-10-08 22:28:34 -07:00 committed by WickedShell
parent 6f0fab6da9
commit beaa069082
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/AP_Scripting/AP_Scripting.cpp
View File

@ -25,7 +25,7 @@
#define SCRIPTING_STACK_MIN_SIZE 2048 #define SCRIPTING_STACK_MIN_SIZE 2048
#if !defined(SCRIPTING_STACK_SIZE) #if !defined(SCRIPTING_STACK_SIZE)
#define SCRIPTING_STACK_SIZE 8192 #define SCRIPTING_STACK_SIZE 16384
#endif // !defined(SCRIPTING_STACK_SIZE) #endif // !defined(SCRIPTING_STACK_SIZE)
#if !defined(SCRIPTING_STACK_MAX_SIZE) #if !defined(SCRIPTING_STACK_MAX_SIZE)
@ -80,7 +80,21 @@ void AP_Scripting::thread(void) {
luaL_openlibs(state); luaL_openlibs(state);
load_lua_bindings(state); load_lua_bindings(state);
luaL_loadstring(state, "gcs.send_text(string.format(\"1 + 2 = %d\", 1+2))"); // luaL_loadstring(state, "gcs.send_text(string.format(\"1 + 2 = %d\", 1+2))");
// load the sandbox creation function
if (luaL_dofile(state, "sandbox.lua")) {
gcs().send_text(MAV_SEVERITY_CRITICAL, "SFATAL: %s", lua_tostring(state, -1));
return;
}
luaL_loadfile(state, "test.lua");
lua_getglobal(state, "get_sandbox_env"); //find the sandbox creation function
if (lua_pcall(state, 0, LUA_MULTRET, 0)) {
gcs().send_text(MAV_SEVERITY_CRITICAL, "SFATAL: %s", lua_tostring(state, -1));
return;
}
lua_setupvalue(state, -2, 1);
while (true) { while (true) {
hal.scheduler->delay(1000); hal.scheduler->delay(1000);

2
libraries/AP_Scripting/lua/src/linit.c
View File

@ -42,7 +42,7 @@
static const luaL_Reg loadedlibs[] = { static const luaL_Reg loadedlibs[] = {
{"_G", luaopen_base}, {"_G", luaopen_base},
{LUA_LOADLIBNAME, luaopen_package}, {LUA_LOADLIBNAME, luaopen_package},
{LUA_COLIBNAME, luaopen_coroutine}, // {LUA_COLIBNAME, luaopen_coroutine},
{LUA_TABLIBNAME, luaopen_table}, {LUA_TABLIBNAME, luaopen_table},
// {LUA_IOLIBNAME, luaopen_io}, // {LUA_IOLIBNAME, luaopen_io},
{LUA_OSLIBNAME, luaopen_os}, {LUA_OSLIBNAME, luaopen_os},