Compare commits

..

2 commits

3 changed files with 29 additions and 2 deletions

View file

@ -2,6 +2,9 @@
#include "datatypes/base.h" #include "datatypes/base.h"
#include "meta.h" #include "meta.h"
#include "lua.h" #include "lua.h"
#include <cstdio>
#include <luajit-2.1/lauxlib.h>
#include <luajit-2.1/lua.h>
#include <pugixml.hpp> #include <pugixml.hpp>
#include <memory> #include <memory>
#include <vector> #include <vector>
@ -21,13 +24,33 @@ LuaSignalConnection::LuaSignalConnection(lua_State* L, std::weak_ptr<Signal> par
// https://stackoverflow.com/a/31952046/16255372 // https://stackoverflow.com/a/31952046/16255372
// Save function so it doesn't get GC'd // Save function and current thread so they don't get GC'd
function = luaL_ref(L, LUA_REGISTRYINDEX); function = luaL_ref(L, LUA_REGISTRYINDEX);
lua_pushthread(L);
thread = luaL_ref(L, LUA_REGISTRYINDEX);
} }
LuaSignalConnection::~LuaSignalConnection() { LuaSignalConnection::~LuaSignalConnection() {
// Remove LuaSignalConnectionthread so that it can get properly GC'd // Remove LuaSignalConnectionthread so that it can get properly GC'd
luaL_unref(state, LUA_REGISTRYINDEX, function); luaL_unref(state, LUA_REGISTRYINDEX, function);
luaL_unref(state, LUA_REGISTRYINDEX, thread);
}
static void stackdump(lua_State* L) {
printf("%d\n", lua_gettop(L));
fflush(stdout);
lua_getfield(L, LUA_GLOBALSINDEX, "tostring");
for (int i = lua_gettop(L)-1; i >= 1; i--) {
lua_pushvalue(L, -1);
lua_pushvalue(L, i);
lua_call(L, 1, 1);
const char* str = lua_tostring(L, -1);
lua_pop(L, 1);
printf("%s: %s\n", lua_typename(L, lua_type(L, i)), str);
}
lua_pop(L, 1);
printf("\n\n");
fflush(stdout);
} }
void LuaSignalConnection::Call(std::vector<Data::Variant> args) { void LuaSignalConnection::Call(std::vector<Data::Variant> args) {
@ -45,6 +68,8 @@ void LuaSignalConnection::Call(std::vector<Data::Variant> args) {
Logger::error(lua_tostring(thread, -1)); Logger::error(lua_tostring(thread, -1));
lua_pop(thread, 1); // Pop return value lua_pop(thread, 1); // Pop return value
} }
lua_pop(state, 1); // Pop thread
} }
// //

View file

@ -44,7 +44,7 @@ public:
class LuaSignalConnection : public SignalConnection { class LuaSignalConnection : public SignalConnection {
lua_State* state; lua_State* state;
int function; int function, thread;
friend Signal; friend Signal;
protected: protected:

View file

@ -117,6 +117,8 @@ int script_delay(lua_State* L) {
luaL_checktype(L, 2, LUA_TFUNCTION); luaL_checktype(L, 2, LUA_TFUNCTION);
lua_State* Lt = lua_newthread(L); // Create a new thread lua_State* Lt = lua_newthread(L); // Create a new thread
// I think this is memory abuse??
// Wouldn't popping the thread in this case make it eligible for garbage collection?
lua_pop(L, 1); // pop the newly created thread so that xmove moves func instead of it into itself lua_pop(L, 1); // pop the newly created thread so that xmove moves func instead of it into itself
lua_xmove(L, Lt, 1); // move func lua_xmove(L, Lt, 1); // move func
lua_pop(L, 1); // pop secs lua_pop(L, 1); // pop secs