From e6e387459ab3e787bd071fe25082e5316141b64b Mon Sep 17 00:00:00 2001
From: leiguangyu <leiguangyu1@huawei.com>
Date: Thu, 17 Jul 2025 12:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4munmap()&&=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: If5ec0545168d5d2dce6f44fbd9c423bbdea528ab
Signed-off-by: leiguangyu <leiguangyu1@huawei.com>
---
 .../process_dump/lperf_events_test.cpp        | 19 -------------------
 tools/process_dump/lperf/lperf_events.cpp     |  8 ++------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/test/unittest/process_dump/lperf_events_test.cpp b/test/unittest/process_dump/lperf_events_test.cpp
index ead95825c..d449bf1b6 100644
--- a/test/unittest/process_dump/lperf_events_test.cpp
+++ b/test/unittest/process_dump/lperf_events_test.cpp
@@ -118,24 +118,5 @@ HWTEST_F(LperfEventsTest, LperfEventsTestTest005, TestSize.Level2)
     EXPECT_EQ(lperfEvents_.PrepareRecord(), -1);
     GTEST_LOG_(INFO) << "LperfEventsTestTest005: end.";
 }
-
-/**
- * @tc.name: LperfEventsTestTest006
- * @tc.desc: test LperfEvents invalid time -1
- * @tc.type: FUNC
- */
-HWTEST_F(LperfEventsTest, LperfEventsTestTest006, TestSize.Level2)
-{
-    GTEST_LOG_(INFO) << "LperfEventsTestTest006: start.";
-    if (IsLinuxKernel()) {
-        return;
-    }
-    LperfEvents lperfEvents_;
-    lperfEvents_.SetTid({getpid()});
-    lperfEvents_.SetTimeOut(-1);
-    lperfEvents_.SetSampleFrequency(100);
-    EXPECT_EQ(lperfEvents_.PrepareRecord(), -1);
-    GTEST_LOG_(INFO) << "LperfEventsTestTest006: end.";
-}
 } // namespace HiviewDFX
 } // namespace OHOS
diff --git a/tools/process_dump/lperf/lperf_events.cpp b/tools/process_dump/lperf/lperf_events.cpp
index 2c546947f..31b03c74f 100644
--- a/tools/process_dump/lperf/lperf_events.cpp
+++ b/tools/process_dump/lperf/lperf_events.cpp
@@ -238,17 +238,13 @@ bool LperfEvents::RecordLoop()
 void LperfEvents::Clear()
 {
     LperfRecordFactory::ClearData();
-    if (lperfMmap_.mmapPage != nullptr) {
-        if (munmap(lperfMmap_.mmapPage, static_cast<size_t>((mmapPages_ + 1) * pageSize_)) < 0) {
-            DFXLOGE("munmap lperfMmap failed");
-        }
-        lperfMmap_.mmapPage = nullptr;
-    }
     pollFds_.clear();
     if (lperfFd_ != -1) {
+        // munmap(lperfMmap_.mmapPage) in kernel when close lperfFd_.
         close(lperfFd_);
         lperfFd_ = -1;
     }
+    lperfMmap_.mmapPage = nullptr;
 }
 } // namespace HiviewDFX
 } // namespace OHOS
-- 
Gitee