From 7affbaa4e966c17abcc53ec732c2619635dd8e47 Mon Sep 17 00:00:00 2001
From: yinbinbin <yinbinbin001@linux.alibaba.com>
Date: Wed, 18 May 2022 11:09:38 +0800
Subject: [PATCH] =?UTF-8?q?memleak:=E5=BF=AB=E9=80=9F=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=A1=AE=E5=AE=9A=E7=BB=93=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yinbinbin <yinbinbin001@linux.alibaba.com>
---
 source/tools/detect/memleak/check.c    | 2 +-
 source/tools/detect/memleak/main.c     | 3 +++
 source/tools/detect/memleak/user_api.h | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/tools/detect/memleak/check.c b/source/tools/detect/memleak/check.c
index bdf422df..4c21645f 100644
--- a/source/tools/detect/memleak/check.c
+++ b/source/tools/detect/memleak/check.c
@@ -96,7 +96,7 @@ int read_meminfo(struct meminfo *mem)
         st_mem.huge2M = hugeTotal * hugeSize;
 
     st_mem.kernel = st_mem.tlmkb - st_mem.frmkb - st_mem.acmkb - st_mem.iamkb - st_mem.lock -\
-                st_mem.bufkb - st_mem.slmkb - st_mem.huge2M - st_mem.huge1G;
+                /*st_mem.bufkb - */st_mem.slmkb - st_mem.huge2M - st_mem.huge1G;
 
     if (st_mem.kernel < 0)
         st_mem.kernel = (1 << 10);
diff --git a/source/tools/detect/memleak/main.c b/source/tools/detect/memleak/main.c
index 9be3a939..bb51e39c 100644
--- a/source/tools/detect/memleak/main.c
+++ b/source/tools/detect/memleak/main.c
@@ -44,6 +44,7 @@ static int memleak_check_only(struct meminfo *mi)
     read_meminfo(mi);
     vmalloc = vmalloc_main(0, NULL);
     printf("allocPages:%dM, uslab:%dM vmalloc:%dM\n", (mi->kernel)/1024, mi->uslabkb/1024, vmalloc/1024);
+    printf("诊断结论:");
     if (mi->kernel < vmalloc)
         mi->kernel = vmalloc + 1;
 
@@ -57,6 +58,8 @@ static int memleak_check_only(struct meminfo *mi)
     } else if (vmalloc > 2*1024 * 1024) {
         printf("vmalloc memleak\n");
         return MEMLEAK_TYPE_VMALLOC;
+    } else {
+        printf(" no memleak\n");
     }
     return 0;
 }
diff --git a/source/tools/detect/memleak/user_api.h b/source/tools/detect/memleak/user_api.h
index c2ce97a7..7f740db0 100644
--- a/source/tools/detect/memleak/user_api.h
+++ b/source/tools/detect/memleak/user_api.h
@@ -20,7 +20,7 @@ struct meminfo {
     unsigned long comkb;
     unsigned long uslabkb;
     unsigned long slabkb;
-    unsigned long kernel;
+    long kernel;
     unsigned long huge2M;
     unsigned long huge1G;
     unsigned long lock;
-- 
Gitee