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

fix issues of LuaJIT/Node

Browse Source
This commit is contained in:
falsycat
2022-08-28 01:03:33 +09:00
parent 3539181650
commit d41fd1c47b
4 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/luajit_thread.cc
View File

@@ -84,15 +84,18 @@ Thread::Handler Thread::CreateNodeLambdaHandler(
case 0:
th.ExecResume(L);
return;
case 2: {
auto k = luaL_checkstring(L, 1);
auto v = nf7::luajit::CheckValue(L, 2);
caller->env().ExecSub(
caller, [caller, callee, k = std::string {k}, v = std::move(v)]() {
caller->Handle(k, v, callee);
});
th.ExecResume(L);
} return;
case 2:
if (auto v = nf7::luajit::ToValue(L, 2)) {
auto k = luaL_checkstring(L, 1);
caller->env().ExecSub(
caller, [caller, callee, k = std::string {k}, v = std::move(v)]() {
caller->Handle(k, *v, callee);
});
th.ExecResume(L);
return;
} else {
}
/* FALLTHROUGH */
default:
if (auto log = th.logger()) {
log->Warn("invalid use of yield, nf7:yield() or nf7:yield(name, value)");

15
common/node_root_lambda.hh
View File

@@ -24,19 +24,16 @@ class NodeRootLambda final : public nf7::Node::Lambda,
NodeRootLambda(NodeRootLambda&&) = delete;
NodeRootLambda& operator=(const NodeRootLambda&) = delete;
NodeRootLambda& operator=(NodeRootLambda&&) = delete;
bool KeepAlive() noexcept {
if (target_.expired() && pro_.size()) {
for (auto& pro : pro_) {
pro.second.Throw(std::make_exception_ptr(
nf7::Exception {"output was never satisified"}));
}
~NodeRootLambda() noexcept {
target_ = nullptr;
for (auto& pro : pro_) {
pro.second.Throw(std::make_exception_ptr(
nf7::Exception {"output was never satisified"}));
}
return !target_.expired();
}
private:
std::weak_ptr<nf7::Node::Lambda> target_;
std::shared_ptr<nf7::Node::Lambda> target_;
std::unordered_map<std::string, nf7::Future<nf7::Value>::Promise> pro_;
std::unordered_map<std::string, std::function<void(const nf7::Value&)>> handler_;