diff --git a/test/unittest/process_dump/lperf_events_test.cpp b/test/unittest/process_dump/lperf_events_test.cpp index ead95825c569b8dbd4ae7a50eb59451fe67a2e29..d449bf1b65fe1059af92e0853671da76935c0d4c 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 2c546947f3cd9d5d11c215c8b57fe8df8ebf54c5..31b03c74f5e819b8a6097b4f56505d491810417e 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((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