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

use traceback for coroutine

Browse Source
This commit is contained in:
云风
2012-08-15 16:07:53 +08:00
parent 5b72cdd4d6
commit d69d3c9965
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lualib/skynet.lua
View File

@@ -9,14 +9,10 @@ local session_id_coroutine = {}
local session_coroutine_id = {}
local session_coroutine_address = {}
local function create_coroutine(f)
return coroutine.create(function(...)
assert(xpcall(f,debug.traceback,...))
end)
end
local function suspend(co, result, command, param, size)
assert(result, command)
if not result then
error(debug.traceback(co,command))
end
if command == "CALL" or command == "SLEEP" then
session_id_coroutine[param] = co
elseif command == "RETURN" then
@@ -28,7 +24,7 @@ local function suspend(co, result, command, param, size)
session_coroutine_id[co] = nil
session_coroutine_address[co] = nil
else
error("Unknown command : " .. command)
error("Unknown command : " .. command .. "\n" .. debug.traceback(co))
end
end
@@ -38,10 +34,10 @@ function skynet.timeout(ti, func, ...)
session = tonumber(session)
local co
if select("#",...) == 0 then
co = create_coroutine(func)
co = coroutine.create(func)
else
local args = { ... }
co = create_coroutine(function()
co = coroutine.create(function()
func(unpack(args))
end)
end
@@ -139,7 +135,7 @@ local function default_dispatch(f)
end
if session <= 0 then
session = - session
co = create_coroutine(f)
co = coroutine.create(f)
session_coroutine_id[co] = session
session_coroutine_address[co] = address
suspend(co, coroutine.resume(co, msg, sz, session, address))
@@ -165,7 +161,7 @@ end
function skynet.start(f)
local session = c.command("TIMEOUT","0")
local co = create_coroutine(
local co = coroutine.create(
function(...)
f(...)
skynet.send(".launcher",0)