Skip to content
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

tweak(scripting/lua): speed up lua event serialization. #3006

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

tweak(scripting/lua): speed up lua event serialization. #3006

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a3a7a2
tweak(scripting/lua): speed up lua event serialization.
icy4471 Dec 15, 2024
c4fe5ec
move msgpack_unpack
icy4471 Dec 19, 2024
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
91 changes: 47 additions & 44 deletions data/shared/citizen/scripting/lua/scheduler.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,59 +146,62 @@ local eventHandlers = {}
local deserializingNetEvent = false

Citizen.SetEventRoutine(function(eventName, eventPayload, eventSource)
-- set the event source
local lastSource = _G.source
_G.source = eventSource

-- try finding an event handler for the event
local eventHandlerEntry = eventHandlers[eventName]

-- deserialize the event structure (so that we end up adding references to delete later on)
local data = msgpack_unpack(eventPayload)

if eventHandlerEntry and eventHandlerEntry.handlers then
-- if this is a net event and we don't allow this event to be triggered from the network, return
if eventSource:sub(1, 3) == 'net' then
if not eventHandlerEntry.safeForNet then
Citizen.Trace('event ' .. eventName .. " was not safe for net\n")

_G.source = lastSource
return
end
-- as the event has no handlers, return early.
if not (eventHandlerEntry and eventHandlerEntry.handlers) then
return
end

deserializingNetEvent = { source = eventSource }
_G.source = tonumber(eventSource:sub(5))
elseif isDuplicityVersion and eventSource:sub(1, 12) == 'internal-net' then
deserializingNetEvent = { source = eventSource:sub(10) }
_G.source = tonumber(eventSource:sub(14))
end
-- set the event source
local lastSource = _G.source
_G.source = eventSource

-- if this is a net event and we don't allow this event to be triggered from the network, return
if eventSource:sub(1, 3) == 'net' then
if not eventHandlerEntry.safeForNet then
Citizen.Trace('event ' .. eventName .. " was not safe for net\n")

-- return an empty table if the data is nil
if not data then
data = {}
_G.source = lastSource
return
end

-- reset serialization
deserializingNetEvent = nil

-- if this is a table...
if type(data) == 'table' then
-- loop through all the event handlers
for k, handler in pairs(eventHandlerEntry.handlers) do
local handlerFn = handler
local handlerMT = getmetatable(handlerFn)
deserializingNetEvent = { source = eventSource }
_G.source = tonumber(eventSource:sub(5))
elseif isDuplicityVersion and eventSource:sub(1, 12) == 'internal-net' then
deserializingNetEvent = { source = eventSource:sub(10) }
_G.source = tonumber(eventSource:sub(14))
end

if handlerMT and handlerMT.__call then
handlerFn = handlerMT.__call
end
-- deserialize the event structure (so that we end up adding references to delete later on)
local data = msgpack_unpack(eventPayload)

-- return an empty table if the data is nil
if not data then
data = {}
end

-- reset serialization
deserializingNetEvent = nil

-- if this is a table...
if type(data) == 'table' then
-- loop through all the event handlers
for k, handler in pairs(eventHandlerEntry.handlers) do
local handlerFn = handler
local handlerMT = getmetatable(handlerFn)

if handlerMT and handlerMT.__call then
handlerFn = handlerMT.__call
end

if type(handlerFn) == 'function' then
local di = debug_getinfo(handlerFn)

Citizen.CreateThreadNow(function()
handler(table_unpack(data))
end, ('event %s [%s[%d..%d]]'):format(eventName, di.short_src, di.linedefined, di.lastlinedefined))
end
if type(handlerFn) == 'function' then
local di = debug_getinfo(handlerFn)

Citizen.CreateThreadNow(function()
handler(table_unpack(data))
end, ('event %s [%s[%d..%d]]'):format(eventName, di.short_src, di.linedefined, di.lastlinedefined))
end
end
end
Expand Down
Loading