From c09703d31427e5f12b483f1b552c8d4444f291e7 Mon Sep 17 00:00:00 2001 From: dongsenhao Date: Mon, 22 May 2023 17:11:48 +0800 Subject: [PATCH] Alarm clearing Signed-off-by: dongsenhao --- libpurgeablemem/cpp/include/purgeable_mem_base.h | 4 ++-- libpurgeablemem/cpp/src/purgeable_mem.cpp | 5 +++-- libpurgeablemem/test/purgeable_cpp_test.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libpurgeablemem/cpp/include/purgeable_mem_base.h b/libpurgeablemem/cpp/include/purgeable_mem_base.h index b11133f..caa36bc 100644 --- a/libpurgeablemem/cpp/include/purgeable_mem_base.h +++ b/libpurgeablemem/cpp/include/purgeable_mem_base.h @@ -101,10 +101,10 @@ public: protected: void *dataPtr_ = nullptr; - size_t dataSizeInput_; + size_t dataSizeInput_ = 0; std::unique_ptr builder_ = nullptr; std::shared_mutex rwlock_; - unsigned int buildDataCount_; + unsigned int buildDataCount_ = 0; bool BuildContent_(); bool IfNeedRebuild_(); virtual bool Pin_(); diff --git a/libpurgeablemem/cpp/src/purgeable_mem.cpp b/libpurgeablemem/cpp/src/purgeable_mem.cpp index 2d9fcf2..254ff09 100644 --- a/libpurgeablemem/cpp/src/purgeable_mem.cpp +++ b/libpurgeablemem/cpp/src/purgeable_mem.cpp @@ -83,8 +83,9 @@ bool PurgeableMem::CreatePurgeableData_() PM_HILOG_DEBUG(LOG_CORE, "%{public}s", __func__); pageTable_ = nullptr; size_t size = RoundUp_(dataSizeInput_, PAGE_SIZE); - int type = MAP_ANONYMOUS; - type |= (UxpteIsEnabled() ? MAP_PURGEABLE : MAP_PRIVATE); + unsigned int utype = MAP_ANONYMOUS; + utype |= (UxpteIsEnabled() ? MAP_PURGEABLE : MAP_PRIVATE); + int type = static_cast(utype); dataPtr_ = mmap(nullptr, size, PROT_READ | PROT_WRITE, type, -1, 0); if (dataPtr_ == MAP_FAILED) { diff --git a/libpurgeablemem/test/purgeable_cpp_test.cpp b/libpurgeablemem/test/purgeable_cpp_test.cpp index c23f675..5813b2b 100644 --- a/libpurgeablemem/test/purgeable_cpp_test.cpp +++ b/libpurgeablemem/test/purgeable_cpp_test.cpp @@ -381,7 +381,7 @@ HWTEST_F(PurgeableCppTest, MutiPageReadWriteTest, TestSize.Level1) HWTEST_F(PurgeableCppTest, MutiMorePageReadWriteTest, TestSize.Level1) { size_t size = 5 * 1024 * 1024; - char *alphabet = (char *)malloc(size); + char *alphabet = static_cast(malloc(size)); size_t len = 0; for (char ch = 'D'; len < size;) { alphabet[len++] = ch; -- Gitee