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

1. 可以在服务运行中动态require socket

Browse Source 
2. 添加方法skynet.retpack/skynet.dispatch_unknown_request
3. skynet.filter透传参数
This commit is contained in:
xjdrew
2014-04-21 17:50:04 +08:00
parent c577a4f07d
commit c081816f06
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lualib-src/lua-socket.c
View File

@@ -491,7 +491,7 @@ luaopen_socketdriver(lua_State *L) {
if (lua == NULL || lua->ctx == NULL) {
return luaL_error(L, "Init skynet context first");
}
assert(lua->L == L);
// assert(lua->L == L);
lua_pop(L,1);
lua_pushlightuserdata(L, lua->ctx);

22
lualib/skynet.lua
View File

@@ -316,6 +316,10 @@ function skynet.ret(msg, sz)
coroutine_yield("RETURN", msg, sz)
end
function skynet.retpack(...)
return skynet.ret(skynet.pack(...))
end
function skynet.wakeup(co)
if sleep_session[co] and wakeup_session[co] == nil then
wakeup_session[co] = true
@@ -329,6 +333,17 @@ function skynet.dispatch(typename, func)
p.dispatch = func
end
local function unknown_request(session, address, msg, sz)
print("Unknown request :" , c.tostring(msg,sz))
error(string.format("Unknown session : %d from %x", session, address))
end
function skynet.dispatch_unknown_request(unknown)
local prev = unknown_request
unknown_request = unknown
return prev
end
local function unknown_response(session, address, msg, sz)
print("Response message :" , c.tostring(msg,sz))
error(string.format("Unknown session : %d from %x", session, address))
@@ -352,7 +367,7 @@ function skynet.fork(func,...)
table.insert(fork_queue, co)
end
local function raw_dispatch_message(prototype, msg, sz, session, source)
local function raw_dispatch_message(prototype, msg, sz, session, source, ...)
-- skynet.PTYPE_RESPONSE = 1, read skynet.h
if prototype == 1 then
local co = session_id_coroutine[session]
@@ -371,10 +386,9 @@ local function raw_dispatch_message(prototype, msg, sz, session, source)
local co = co_create(f)
session_coroutine_id[co] = session
session_coroutine_address[co] = source
suspend(co, coroutine.resume(co, session,source, p.unpack(msg,sz)))
suspend(co, coroutine.resume(co, session,source, p.unpack(msg,sz, ...)))
else
print("Unknown request :" , p.unpack(msg,sz))
error(string.format("Can't dispatch type %s : ", p.name))
unknown_request(session, source, msg, sz)
end
end
end