From 8a1d7006eb91ad555630846178e66682a0cef4af Mon Sep 17 00:00:00 2001
From: zixun <lvzixun@gmail.com>
Date: Sat, 19 Oct 2019 11:25:42 +0800
Subject: [PATCH] fix match thread, table key

---
 lualib-src/lua-sharetable.c  | 29 +++++++++++++++++++
 lualib/skynet/sharetable.lua | 56 ++++++++++++++++++++++++++++++++++--
 2 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/lualib-src/lua-sharetable.c b/lualib-src/lua-sharetable.c
index 660d27ec..dcfd460d 100644
--- a/lualib-src/lua-sharetable.c
+++ b/lualib-src/lua-sharetable.c
@@ -83,6 +83,34 @@ clone_table(lua_State *L) {
 	return 1;
 }
 
+static int
+lco_stackvalues(lua_State* L) {
+    lua_State *cL = lua_tothread(L, 1);
+    luaL_argcheck(L, cL, 1, "thread expected");
+    int n = 0;
+    if(cL != L) {
+        luaL_checktype(L, 2, LUA_TTABLE);
+        n = lua_gettop(cL);
+        if(n > 0) {
+            lua_checkstack(L, n+1);
+            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);
+            }
+            lua_xmove(L, cL, n);
+        } else {
+            n = 0;
+        }
+    }
+
+    lua_pushinteger(L, n);
+    return 1;
+}
+
+
 struct state_ud {
 	lua_State *L;
 };
@@ -218,6 +246,7 @@ luaopen_skynet_sharetable_core(lua_State *L) {
 	luaL_checkversion(L);
 	luaL_Reg l[] = {
 		{ "clone", clone_table },
+		{ "stackvalues", lco_stackvalues }, 
 		{ "matrix", matrix_from_file },
 		{ "is_sharedtable", lis_sharedtable },
 		{ NULL, NULL },
diff --git a/lualib/skynet/sharetable.lua b/lualib/skynet/sharetable.lua
index 5fff58c3..87829b3e 100644
--- a/lualib/skynet/sharetable.lua
+++ b/lualib/skynet/sharetable.lua
@@ -2,6 +2,7 @@ local skynet = require "skynet"
 local service = require "skynet.service"
 local core = require "skynet.sharetable.core"
 local is_sharedtable = core.is_sharedtable
+local stackvalues = core.stackvalues
 
 local function sharetable_service()
 	local skynet = require "skynet"
@@ -257,6 +258,10 @@ local function resolve_replace(replace_map)
 
     local function match_value(v)
         assert(v ~= nil)
+        if v == RECORD then
+            return
+        end
+
         local tv = type(v)
         local f = match[tv]
         if record_map[v] or is_sharedtable(v) then
@@ -283,7 +288,13 @@ local function resolve_replace(replace_map)
     end
 
     local function match_table(t)
+        local keys = {}
         for k,v in next, t do
+            local tk = type(k)
+            if match[tk] then
+                keys[#keys+1] = k
+            end
+
             local nv = replace_map[v]
             if nv then
                 nv = getnv(v)
@@ -292,6 +303,20 @@ local function resolve_replace(replace_map)
                 match_value(v)
             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 new_k then
+                    rawset(t, new_k, value)
+                end
+            else
+                match_value(old_k)
+            end
+        end
         match_mt(t)
     end
 
@@ -345,8 +370,33 @@ local function resolve_replace(replace_map)
         match_funcinfo(info)
     end
 
+    local stack_values_tmp = {}
     local function match_thread(co)
+        -- match stackvalues
+        local n = stackvalues(co, stack_values_tmp)
+        for i=1,n do
+            local v = stack_values_tmp[i]
+            stack_values_tmp[i] = nil
+            match_value(v)
+        end
+
+        -- match callinfo
         local level = 1
+        -- jump the fucntion from sharetable.update to top
+        local is_self = coroutine.running() == co
+        if is_self then
+            while true do
+                local info = getinfo(co, level, "uf")
+                level = level + 1
+                if not info then
+                    level = 1
+                    break
+                elseif info.func == sharetable.update then
+                    break
+                end
+            end
+        end
+
         while true do
             local info = getinfo(co, level, "uf")
             if not info then
@@ -380,13 +430,15 @@ function sharetable.update(...)
 			for old_t,_ in pairs(map) do
 				if old_t ~= new_t then
 					insert_replace(old_t, new_t, replace_map)
+                    map[old_t] = nil
 				end
 			end
-			RECORD[name] = nil
 		end
 	end
 
-	resolve_replace(replace_map)
+    if next(replace_map) then
+	   resolve_replace(replace_map)
+    end
 end
 
 return sharetable