lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

use pcall in message queue dispatch

Browse Source
This commit is contained in:
云风
2013-10-30 19:45:41 +08:00
parent 0b9d7d8a62
commit 9a8a9fd637
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lualib/mqueue.lua
View File

@@ -20,6 +20,18 @@ skynet.register_protocol {
end end
} }
local function report_error(succ, ...)
if succ then
return ...
else
print("Message queue dispatch error: ", ...)
end
end
local function do_func(f, msg)
return report_error(pcall(f, table.unpack(msg)))
end
local function message_dispatch(f) local function message_dispatch(f)
while true do while true do
if #message_queue==0 then if #message_queue==0 then
@@ -29,9 +41,9 @@ local function message_dispatch(f)
local msg = table.remove(message_queue,1) local msg = table.remove(message_queue,1)
local session = msg.session local session = msg.session
if session == 0 then if session == 0 then
assert(f(table.unpack(msg))==nil, "message in queue returns value") assert(do_func(f, msg) == nil, "message in queue returns value")
else else
local data, size = skynet.pack(f(table.unpack(msg))) local data, size = skynet.pack(do_func(f,msg))
-- 1 means response -- 1 means response
c.send(msg.addr, 1, session, data, size) c.send(msg.addr, 1, session, data, size)
end end