nf7/nf7
nf7/nf7
1
0
Fork 0
Code Issues 9 Pull Requests Projects 3 Releases 5 Wiki Activity

fix leaks of luajit::Thread

Browse Source
This commit is contained in:
falsycat 2022-11-15 15:42:05 +09:00
parent 00d9697b9d
commit d284221f2c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/luajit_thread.cc
View File

@ -57,13 +57,15 @@ void Thread::Resume(lua_State* L, int narg) noexcept {
if (state_ == kAborted) return;
switch (ret) {
case 0:
state_ = kFinished;
th_ref_ = std::nullopt;
state_ = kFinished;
break;
case LUA_YIELD:
state_ = kPaused;
break;
default:
state_ = kAborted;
th_ref_ = std::nullopt;
state_ = kAborted;
}
if (!std::exchange(skip_handle_, false)) {
handler_(*this, L);

13
file/luajit_node.cc
View File

@ -126,7 +126,9 @@ class Node::Lambda final : public nf7::Node::Lambda,
public std::enable_shared_from_this<Node::Lambda> {
public:
Lambda(Node& f, const std::shared_ptr<nf7::Node::Lambda>& parent) noexcept :
nf7::Node::Lambda(f, parent), f_(f.life_), log_(f.log_) {
nf7::Node::Lambda(f, parent),
f_(f.life_), log_(f.log_),
table_ctx_(std::make_shared<nf7::GenericContext>(f, "LuaJIT Node context table")) {
}
void Handle(const nf7::Node::Lambda::Msg& in) noexcept override
@ -151,7 +153,8 @@ class Node::Lambda final : public nf7::Node::Lambda,
std::shared_ptr<nf7::LoggerRef> log_;
std::mutex mtx_;
std::optional<nf7::luajit::Ref> ctx_;
std::shared_ptr<nf7::Context> table_ctx_;
std::optional<nf7::luajit::Ref> table_;
nf7::ContextOwner th_owner_;
@ -169,15 +172,15 @@ class Node::Lambda final : public nf7::Node::Lambda,
ljq->Push(self, [this, ljq, th, func, in](auto L) mutable {
{
std::unique_lock<std::mutex> k {mtx_};
if (!ctx_ || ctx_->ljq() != ljq) {
if (!table_ || table_->ljq() != ljq) {
lua_createtable(L, 0, 0);
ctx_.emplace(shared_from_this(), ljq, L);
table_.emplace(table_ctx_, ljq, L);
}
}
L = th->Init(L);
func->PushSelf(L);
nf7::luajit::PushAll(L, in.name, in.value);
ctx_->PushSelf(L);
table_->PushSelf(L);
th->Resume(L, 3);
});
}