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

remove magic number in lua

Browse Source
This commit is contained in:
云风
2013-12-18 22:42:10 +08:00
parent f54776e181
commit 331c8009f8
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lualib/skynet.lua
View File

@@ -8,7 +8,20 @@ local pairs = pairs
local pcall = pcall local pcall = pcall
local proto = {} local proto = {}
local skynet = {} local skynet = {
-- read skynet.h
PTYPE_TEXT = 0,
PTYPE_RESPONSE = 1,
PTYPE_MULTICAST = 2,
PTYPE_CLIENT = 3,
PTYPE_SYSTEM = 4,
PTYPE_HARBOR = 5,
PTYPE_SOCKET = 6,
PTYPE_ERROR = 7,
PTYPE_QUEUE = 8,
PTYPE_DEBUG = 9,
PTYPE_LUA = 10
}
-- code cache -- code cache
skynet.cache = require "skynet.codecache" skynet.cache = require "skynet.codecache"
@@ -138,8 +151,7 @@ function suspend(co, result, command, param, size)
local session = session_coroutine_id[co] local session = session_coroutine_id[co]
local addr = session_coroutine_address[co] local addr = session_coroutine_address[co]
if session and session ~= 0 then if session and session ~= 0 then
-- 7 means error (PTYPE_RESERVED_ERROR) c.send(addr, skynet.PTYPE_ERROR, session, "")
c.send(addr, 7, session, "")
end end
session_coroutine_id[co] = nil session_coroutine_id[co] = nil
session_coroutine_address[co] = nil session_coroutine_address[co] = nil
@@ -155,7 +167,6 @@ function suspend(co, result, command, param, size)
elseif command == "RETURN" then elseif command == "RETURN" then
local co_session = session_coroutine_id[co] local co_session = session_coroutine_id[co]
local co_address = session_coroutine_address[co] local co_address = session_coroutine_address[co]
-- PTYPE_RESPONSE = 1 , see skynet.h
if param == nil then if param == nil then
trace_count() trace_count()
error(debug.traceback(co)) error(debug.traceback(co))
@@ -163,8 +174,7 @@ function suspend(co, result, command, param, size)
-- c.send maybe throw a error, so call trace_count first. -- c.send maybe throw a error, so call trace_count first.
-- The coroutine execute time after skynet.ret() will not be trace. -- The coroutine execute time after skynet.ret() will not be trace.
trace_count() trace_count()
-- 1 means response (PTYPE_RESPONSE) c.send(co_address, skynet.PTYPE_RESPONSE, co_session, param, size)
c.send(co_address, 1, co_session, param, size)
return suspend(co, coroutine.resume(co)) return suspend(co, coroutine.resume(co))
elseif command == "EXIT" then elseif command == "EXIT" then
-- coroutine exit -- coroutine exit
@@ -375,7 +385,7 @@ function skynet.fork(func,...)
end end
local function raw_dispatch_message(prototype, msg, sz, session, source, ...) local function raw_dispatch_message(prototype, msg, sz, session, source, ...)
-- PTYPE_RESPONSE = 1, read skynet.h -- skynet.PTYPE_RESPONSE = 1, read skynet.h
if prototype == 1 then if prototype == 1 then
local co = session_id_coroutine[session] local co = session_id_coroutine[session]
if co == "BREAK" then if co == "BREAK" then
@@ -544,7 +554,7 @@ do
REG { REG {
name = "text", name = "text",
id = 0, id = skynet.PTYPE_TEXT,
pack = function (...) pack = function (...)
local n = select ("#" , ...) local n = select ("#" , ...)
if n == 0 then if n == 0 then
@@ -560,19 +570,19 @@ do
REG { REG {
name = "lua", name = "lua",
id = 10, id = skynet.PTYPE_LUA,
pack = skynet.pack, pack = skynet.pack,
unpack = skynet.unpack, unpack = skynet.unpack,
} }
REG { REG {
name = "response", name = "response",
id = 1, id = skynet.PTYPE_RESPONSE,
} }
REG { REG {
name = "debug", name = "debug",
id = 9, id = skynet.PTYPE_DEBUG,
pack = skynet.pack, pack = skynet.pack,
unpack = skynet.unpack, unpack = skynet.unpack,
dispatch = _debug_dispatch, dispatch = _debug_dispatch,
@@ -580,7 +590,7 @@ do
REG { REG {
name = "error", name = "error",
id = 7, id = skynet.PTYPE_ERROR,
pack = skynet.pack, pack = skynet.pack,
unpack = skynet.unpack, unpack = skynet.unpack,
dispatch = _error_dispatch, dispatch = _error_dispatch,

2
lualib/socket.lua
View File

@@ -104,7 +104,7 @@ end
skynet.register_protocol { skynet.register_protocol {
name = "socket", name = "socket",
id = 6, -- PTYPE_SOCKET id = skynet.PTYPE_SOCKET, -- PTYPE_SOCKET = 6
unpack = driver.unpack, unpack = driver.unpack,
dispatch = function (_, _, t, n1, n2, data) dispatch = function (_, _, t, n1, n2, data)
socket_message[t](n1,n2,data) socket_message[t](n1,n2,data)

2
service/simplemonitor.lua
View File

@@ -6,7 +6,7 @@ local service_map = {}
skynet.register_protocol { skynet.register_protocol {
name = "client", name = "client",
id = 3, id = skynet.PTYPE_CLIENT, -- PTYPE_CLIENT = 3
unpack = function() end, unpack = function() end,
dispatch = function(_, address) dispatch = function(_, address)
local w = service_map[address] local w = service_map[address]