From 98f9006dc27b692ba8e7825f1bdc9aa2fc1349e2 Mon Sep 17 00:00:00 2001 From: dongsenhao Date: Fri, 30 Jun 2023 16:55:24 +0800 Subject: [PATCH] cleaning the alarm Signed-off-by: dongsenhao --- .../test/unittest/libdmabufheap/dmabuf_alloc_test.cpp | 2 +- libpurgeablemem/c/src/purgeable_mem_c.c | 11 +++++------ libpurgeablemem/common/include/pm_ptr_util.h | 7 ------- libpurgeablemem/cpp/include/purgeable_ashmem.h | 3 ++- libpurgeablemem/cpp/src/purgeable_ashmem.cpp | 3 ++- libpurgeablemem/cpp/src/purgeable_mem.cpp | 3 ++- libpurgeablemem/cpp/src/purgeable_mem_base.cpp | 3 ++- libpurgeablemem/test/purgeableashmem_test.cpp | 5 +++-- 8 files changed, 17 insertions(+), 20 deletions(-) diff --git a/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp b/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp index e8c36d5..9a318fc 100644 --- a/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp +++ b/libdmabufheap/test/unittest/libdmabufheap/dmabuf_alloc_test.cpp @@ -25,8 +25,8 @@ #include #include #include -#include "securec.h" #include "gtest/gtest.h" +#include "securec.h" #include "dmabuf_alloc.h" using namespace testing; diff --git a/libpurgeablemem/c/src/purgeable_mem_c.c b/libpurgeablemem/c/src/purgeable_mem_c.c index 942b265..8671c73 100644 --- a/libpurgeablemem/c/src/purgeable_mem_c.c +++ b/libpurgeablemem/c/src/purgeable_mem_c.c @@ -330,18 +330,20 @@ bool PurgMemBeginWrite(struct PurgMem *purgObj) if (rwlockRet != 0) { PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: wrlock fail. %{public}d", __func__, rwlockRet); err = PM_LOCK_WRITE_FAIL; - goto uxpte_put; + PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: %{public}s, return false, UxptePut.", __func__, GetPMStateName(err)); + UxptePut(purgObj->uxPageTable, (uint64_t)(purgObj->dataPtr), purgObj->dataSizeInput); + return false; } if (!IsPurged(purgObj)) { - goto succ; + return true; } /* data is purged */ rebuildRet = PurgMemBuildData_(purgObj); PM_HILOG_INFO_C(LOG_CORE, "%{public}s: purged, built %{public}s", __func__, rebuildRet ? "succ" : "fail"); if (rebuildRet) { - goto succ; + return true; } /* data is purged and rebuild failed. return false */ err = PMB_BUILD_ALL_FAIL; @@ -350,12 +352,9 @@ bool PurgMemBeginWrite(struct PurgMem *purgObj) PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: wr unlock fail. %{public}d", __func__, rwlockRet); } -uxpte_put: PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: %{public}s, return false, UxptePut.", __func__, GetPMStateName(err)); UxptePut(purgObj->uxPageTable, (uint64_t)(purgObj->dataPtr), purgObj->dataSizeInput); return false; -succ: - return true; } static inline void EndAccessPurgMem_(struct PurgMem *purgObj) diff --git a/libpurgeablemem/common/include/pm_ptr_util.h b/libpurgeablemem/common/include/pm_ptr_util.h index 6180d6a..3151f19 100644 --- a/libpurgeablemem/common/include/pm_ptr_util.h +++ b/libpurgeablemem/common/include/pm_ptr_util.h @@ -26,11 +26,4 @@ } \ } while (0) -#define IF_NULL_LOG(pointer, log) \ - do { \ - if (!(pointer)) { \ - HILOG_ERROR(LOG_CORE, "%{public}s:", log); \ - } \ - } while (0) - #endif /* OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_COMMON_INCLUDE_PM_PTR_UTIL_H */ diff --git a/libpurgeablemem/cpp/include/purgeable_ashmem.h b/libpurgeablemem/cpp/include/purgeable_ashmem.h index 42435d8..627e9b5 100644 --- a/libpurgeablemem/cpp/include/purgeable_ashmem.h +++ b/libpurgeablemem/cpp/include/purgeable_ashmem.h @@ -16,13 +16,14 @@ #ifndef OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_ASHMEM_H #define OHOS_UTILS_MEMORY_LIBPURGEABLEMEM_CPP_INCLUDE_PURGEABLE_ASHMEM_H -#include #include #include #include #include #include +#include + #include "ashmem.h" #include "purgeable_mem_builder.h" #include "purgeable_mem_base.h" diff --git a/libpurgeablemem/cpp/src/purgeable_ashmem.cpp b/libpurgeablemem/cpp/src/purgeable_ashmem.cpp index 42c4c48..70b438d 100644 --- a/libpurgeablemem/cpp/src/purgeable_ashmem.cpp +++ b/libpurgeablemem/cpp/src/purgeable_ashmem.cpp @@ -19,9 +19,10 @@ #include "pm_util.h" #include "pm_state_c.h" #include "pm_smartptr_util.h" -#include "purgeable_ashmem.h" #include "pm_log.h" +#include "purgeable_ashmem.h" + namespace OHOS { namespace PurgeableMem { #ifdef LOG_TAG diff --git a/libpurgeablemem/cpp/src/purgeable_mem.cpp b/libpurgeablemem/cpp/src/purgeable_mem.cpp index 55cccf5..1ee83a0 100644 --- a/libpurgeablemem/cpp/src/purgeable_mem.cpp +++ b/libpurgeablemem/cpp/src/purgeable_mem.cpp @@ -19,9 +19,10 @@ #include "pm_util.h" #include "pm_state_c.h" #include "pm_smartptr_util.h" -#include "purgeable_mem.h" #include "pm_log.h" +#include "purgeable_mem.h" + namespace OHOS { namespace PurgeableMem { #ifdef LOG_TAG diff --git a/libpurgeablemem/cpp/src/purgeable_mem_base.cpp b/libpurgeablemem/cpp/src/purgeable_mem_base.cpp index 65fef8e..86b0bf2 100644 --- a/libpurgeablemem/cpp/src/purgeable_mem_base.cpp +++ b/libpurgeablemem/cpp/src/purgeable_mem_base.cpp @@ -19,9 +19,10 @@ #include "pm_util.h" #include "pm_state_c.h" #include "pm_smartptr_util.h" -#include "purgeable_mem_base.h" #include "pm_log.h" +#include "purgeable_mem_base.h" + namespace OHOS { namespace PurgeableMem { #ifdef LOG_TAG diff --git a/libpurgeablemem/test/purgeableashmem_test.cpp b/libpurgeablemem/test/purgeableashmem_test.cpp index fc1a95d..2b6f2ac 100644 --- a/libpurgeablemem/test/purgeableashmem_test.cpp +++ b/libpurgeablemem/test/purgeableashmem_test.cpp @@ -15,15 +15,16 @@ #include #include -#include #include #include #include #include #include -#include "ashmem.h" +#include + #include "gtest/gtest.h" +#include "ashmem.h" #include "purgeable_ashmem.h" #include "securec.h" -- Gitee