Skip to content

luajit: fix bad callback errors #1076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2025
Merged

luajit: fix bad callback errors #1076

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions luajit/upipe.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ local function wrap_traceback(f)
end
end

local function jit_off(f)
if type(f) ~= 'function' then
return function (...) return f(...) end
end
jit.off(f)
return f
end

local props = { }

local function props_key(ptr)
Expand Down Expand Up @@ -341,9 +349,9 @@ local upipe_methods = {
assert(pipe ~= nil, "upipe_flow_alloc_sub failed")
return ffi.gc(pipe, C.upipe_release)
end,
release = function (pipe)
release = jit_off(function (pipe)
C.upipe_release(ffi.gc(pipe, nil))
end,
end),
iterate_sub = function (pipe, p)
local f = C.upipe_iterate_sub
return p and f(pipe, p) or iterator(pipe, f, "struct upipe *")
Expand Down Expand Up @@ -372,14 +380,18 @@ ffi.metatype("struct upipe", {
if props and props._control and props._control[key] then
f = props._control[key]
else
f = C["upipe_" .. key]
f = jit_off(C["upipe_" .. key])
end
return getter(upipe_getters, f, key)
end,
__newindex = function (pipe, key, val)
__newindex = jit_off(function (pipe, key, val)
local sym = "upipe_set_" .. key
assert(C.ubase_check(C[sym](pipe, val)), sym)
end,
local ret = C[sym](pipe, val)
if not C.ubase_check(ret) then
local msg = C.ubase_err_str(ret)
error(fmt("%s: %s", sym, msg ~= nil and ffi.string(msg) or ret))
end
end),
__concat = function (pipe, next_pipe)
local last = pipe
local output = ffi.new("struct upipe *[1]")
Expand Down
Loading