From 596e19ad3d492769ea67e3d25a1fdead0013957c Mon Sep 17 00:00:00 2001 From: yinbinbin Date: Tue, 12 Apr 2022 20:24:01 +0800 Subject: [PATCH 1/2] memgraph:fix use memory usage Signed-off-by: yinbinbin --- source/tools/detect/memgraph/memgraph.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/tools/detect/memgraph/memgraph.py b/source/tools/detect/memgraph/memgraph.py index 56ef76b8..01befdc1 100644 --- a/source/tools/detect/memgraph/memgraph.py +++ b/source/tools/detect/memgraph/memgraph.py @@ -126,7 +126,7 @@ def is_number(s): return False def get_page_used(meminfo): - user = meminfo["Buffers"] + meminfo["Active(anon)"] + meminfo["Inactive(anon)"] + user = meminfo["Active(anon)"] + meminfo["Inactive(anon)"] user += meminfo["Active(file)"] + meminfo["Inactive(file)"] user += meminfo["Mlocked"] + meminfo["2048"] + meminfo["1048576"] kernelOther = meminfo["Slab"] + meminfo["KernelStack"] + meminfo["PageTables"] @@ -208,7 +208,7 @@ def memgraph_graph(meminfo): res["used"] = memgraph_free(meminfo) user = {} user["anon"] = meminfo["Active(anon)"] + meminfo["Inactive(anon)"] - user["cache"] = meminfo["Active(file)"] + meminfo["Inactive(file)"] + user["cache"] = meminfo["Cached"] user["buffers"] = meminfo["Buffers"] user["mlock"] = meminfo["Mlocked"] user["huge2M"] = meminfo["2048"] -- Gitee From d63d2fe92d035a3b6a95512b06a84f5fee7feecd Mon Sep 17 00:00:00 2001 From: yinbinbin Date: Wed, 20 Apr 2022 15:23:26 +0800 Subject: [PATCH 2/2] skcheck:fix socket check error Signed-off-by: yinbinbin --- source/tools/detect/skcheck/skcheck.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/tools/detect/skcheck/skcheck.py b/source/tools/detect/skcheck/skcheck.py index ebc636e6..faaf7252 100644 --- a/source/tools/detect/skcheck/skcheck.py +++ b/source/tools/detect/skcheck/skcheck.py @@ -181,10 +181,12 @@ def scan_all_proc(inodes): if not os.path.exists(procName+fd): continue link = os.readlink(procName+fd) - if link.find("socket") == -1: + if link.find("socket:[") == -1: continue - inodeNum += 1 inode = link.strip().split("[") + if len(inode) < 2: + continue + inodeNum += 1 inode = inode[1][:-1].strip() #print("fd {} link {} inode {}".format(procName+fd, link, inode)) if inode not in inodes: -- Gitee