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

bugfix: remote object support term signal

Browse Source
This commit is contained in:
云风
2013-12-09 21:25:22 +08:00
parent 053e1e6b44
commit 294f6feb50
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lualib/skynet.lua
View File

@@ -172,7 +172,7 @@ function skynet.sleep(ti)
local session = c.command("TIMEOUT",tostring(ti)) local session = c.command("TIMEOUT",tostring(ti))
assert(session) assert(session)
session = tonumber(session) session = tonumber(session)
local ret = coroutine_yield("SLEEP", session) local succ, ret = coroutine_yield("SLEEP", session)
sleep_session[coroutine.running()] = nil sleep_session[coroutine.running()] = nil
if ret == true then if ret == true then
c.trace_switch(trace_handle, session) c.trace_switch(trace_handle, session)
@@ -486,8 +486,12 @@ do
local addr = remote_query(t.__remote) local addr = remote_query(t.__remote)
-- the proto is 11 (lua is 10) -- the proto is 11 (lua is 10)
local session = assert(_send(addr, 11 , nil, _pack(t,method,...)), "call to invalid address") local session = assert(_send(addr, 11 , nil, _pack(t,method,...)), "call to invalid address")
local msg, sz = coroutine_yield(session) local succ, msg, sz = coroutine_yield("CALL", session)
if succ then
return select(2,assert(_unpack(msg,sz))) return select(2,assert(_unpack(msg,sz)))
else
error "call to dead remote object"
end
end end
remote_call_func[method] = f remote_call_func[method] = f
end end