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

split skynet.debug to skynet.inject

Browse Source
This commit is contained in:
Cloud Wu
2014-08-13 21:24:48 +08:00
parent 939ef564ce
commit 8078d777ab
2 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lualib/skynet/debug.lua
View File

@@ -47,70 +47,9 @@ function dbgcmd.EXIT()
skynet.exit() skynet.exit()
end end
local function getupvaluetable(u, func, unique)
i = 1
while true do
local name, value = debug.getupvalue(func, i)
if name == nil then
return
end
local t = type(value)
if t == "table" then
u[name] = value
elseif t == "function" then
if not unique[value] then
unique[value] = true
getupvaluetable(u, value, unique)
end
end
i=i+1
end
end
function dbgcmd.RUN(source, filename) function dbgcmd.RUN(source, filename)
if filename then local inject = require "skynet.inject"
filename = "@" .. filename local output = inject(source, filename , dispatch_func, skynet.register_protocol)
else
filename = "=(load)"
end
local output = {}
do
local function print(...)
local value = { ... }
for k,v in ipairs(value) do
value[k] = tostring(v)
end
table.insert(output, table.concat(value, "\t"))
end
local u = {}
local unique = {}
getupvaluetable(u, dispatch_func, unique)
getupvaluetable(u, skynet.register_protocol, unique)
local p = {}
local proto = u.proto
if proto then
for k,v in pairs(proto) do
local name, dispatch = v.name, v.dispatch
if name and dispatch then
local pp = {}
p[name] = pp
getupvaluetable(pp, dispatch, unique)
end
end
end
local env = setmetatable( { print = print , _U = u, _P = p}, { __index = _ENV })
local func, err = load(source, filename, "bt", env)
if not func then
skynet.ret(skynet.pack(err))
return
end
local ok, err = pcall(func)
if not ok then
table.insert(output, err)
end
source, filename = nil
end
collectgarbage "collect" collectgarbage "collect"
skynet.ret(skynet.pack(table.concat(output, "\n"))) skynet.ret(skynet.pack(table.concat(output, "\n")))
end end

65
lualib/skynet/inject.lua Normal file
View File

@@ -0,0 +1,65 @@
local function getupvaluetable(u, func, unique)
i = 1
while true do
local name, value = debug.getupvalue(func, i)
if name == nil then
return
end
local t = type(value)
if t == "table" then
u[name] = value
elseif t == "function" then
if not unique[value] then
unique[value] = true
getupvaluetable(u, value, unique)
end
end
i=i+1
end
end
return function(source, filename , ...)
if filename then
filename = "@" .. filename
else
filename = "=(load)"
end
local output = {}
local function print(...)
local value = { ... }
for k,v in ipairs(value) do
value[k] = tostring(v)
end
table.insert(output, table.concat(value, "\t"))
end
local u = {}
local unique = {}
local funcs = { ... }
for k, func in ipairs(funcs) do
getupvaluetable(u, func, unique)
end
local p = {}
local proto = u.proto
if proto then
for k,v in pairs(proto) do
local name, dispatch = v.name, v.dispatch
if name and dispatch then
local pp = {}
p[name] = pp
getupvaluetable(pp, dispatch, unique)
end
end
end
local env = setmetatable( { print = print , _U = u, _P = p}, { __index = _ENV })
local func, err = load(source, filename, "bt", env)
if not func then
return { err }
end
local ok, err = xpcall(func, debug.traceback)
if not ok then
table.insert(output, err)
end
return output
end