lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix match intern mt and stackvalues

Browse Source
This commit is contained in:
zixun
2019-10-21 11:38:08 +08:00
committed by 云风
parent 8a1d7006eb
commit f17c17b8c7
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lualib-src/lua-sharetable.c
View File

@@ -92,17 +92,15 @@ lco_stackvalues(lua_State* L) {
luaL_checktype(L, 2, LUA_TTABLE);
n = lua_gettop(cL);
if(n > 0) {
lua_checkstack(L, n+1);
luaL_checkstack(L, n+1, NULL);
int top = lua_gettop(L);
lua_xmove(cL, L, n);
int i=0;
for(i=0; i<n; i++) {
lua_pushvalue(L, top+1+i);
lua_seti(L, 2, i+1);
for(i=1; i<=n; i++) {
lua_pushvalue(L, top+i);
lua_seti(L, 2, i);
}
lua_xmove(L, cL, n);
} else {
n = 0;
}
}

45
lualib/skynet/sharetable.lua
View File

@@ -275,23 +275,40 @@ local function resolve_replace(replace_map)
end
local function match_mt(v)
local mt = getmetatable(v)
local mt = debug.getmetatable(v)
if mt then
local nv = replace_map[mt]
if nv then
nv = getnv(mt)
setmetatable(v, nv)
debug.setmetatable(v, nv)
else
match_value(mt)
end
end
end
local function match_internmt()
local internal_types = {
pointer = debug.upvalueid(getnv, 1),
boolean = false,
str = "",
number = 42,
thread = coroutine.running(),
func = getnv,
}
for _,v in pairs(internal_types) do
match_mt(v)
end
match_mt(nil)
end
local function match_table(t)
local keys = {}
local keys = false
for k,v in next, t do
local tk = type(k)
if match[tk] then
keys = keys or {}
keys[#keys+1] = k
end
@@ -304,17 +321,19 @@ local function resolve_replace(replace_map)
end
end
for _, old_k in ipairs(keys) do
local new_k = replace_map[old_k]
if new_k then
local value = rawget(t, old_k)
new_k = getnv(old_k)
rawset(t, old_k, nil)
if keys then
for _, old_k in ipairs(keys) do
local new_k = replace_map[old_k]
if new_k then
rawset(t, new_k, value)
local value = rawget(t, old_k)
new_k = getnv(old_k)
rawset(t, old_k, nil)
if new_k then
rawset(t, new_k, value)
end
else
match_value(old_k)
end
else
match_value(old_k)
end
end
match_mt(t)
@@ -414,6 +433,8 @@ local function resolve_replace(replace_map)
match["userdata"] = match_userdata
match["thread"] = match_thread
match_internmt()
local root = debug.getregistry()
assert(replace_map[root] == nil)
match_table(root)