Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

添加snapshot内存快照debug指令 #848

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

添加snapshot内存快照debug指令 #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7af81e6
集成lua-snapshot, 增加内存快照debug指令
spin6lock Jun 8, 2018
0556296
更新snapshot_utils树算法
spin6lock Jun 11, 2018
00ed1d1
优化排版
spin6lock Jun 11, 2018
84d4d9b
改为使用时再require snapshot
spin6lock Jun 11, 2018
7931abe
move lua-snapshot into 3rd
spin6lock May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "3rd/jemalloc"]
path = 3rd/jemalloc
url = https://github.com/jemalloc/jemalloc.git
[submodule "3rd/lua-snapshot"]
path = 3rd/lua-snapshot
url = https://github.com/cloudwu/lua-snapshot.git
1 change: 1 addition & 0 deletions 3rd/lua-snapshot
Open in desktop
Submodule lua-snapshot added at 5fdc88
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ LUA_CLIB_SKYNET = \
lua-mysqlaux.c \
lua-debugchannel.c \
lua-datasheet.c \
lua-snapshot.c \
\

SKYNET_SRC = skynet_main.c skynet_handle.c skynet_module.c skynet_mq.c \
Expand Down
21 changes: 21 additions & 0 deletions lualib/skynet/debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,27 @@ local function init(skynet, export)
skynet.ret()
end

local old_snapshot
function dbgcmd.SNAPSHOT()
local snapshot = require "snapshot"
local construct_indentation = (require "skynet.snapshot_utils").construct_indentation
collectgarbage "collect"
local new_snapshot = snapshot()
if not old_snapshot then
old_snapshot = new_snapshot
return skynet.ret(skynet.pack({}))
end
local diff = {}
for k,v in pairs(new_snapshot) do
if not old_snapshot[k] then
diff[k] = v
end
end
old_snapshot = new_snapshot
local ret = construct_indentation(diff)
skynet.ret(skynet.pack(ret))
end

return dbgcmd
end -- function init_dbgcmd

Expand Down