diff --git a/libpurgeablemem/c/src/purgeable_mem_builder_c.c b/libpurgeablemem/c/src/purgeable_mem_builder_c.c index 20023add30b81f189150f1727860156ed62f3b7d..73f479c9826f11a353d1bc2bce9d0a7748a27b90 100644 --- a/libpurgeablemem/c/src/purgeable_mem_builder_c.c +++ b/libpurgeablemem/c/src/purgeable_mem_builder_c.c @@ -34,7 +34,7 @@ struct PurgMemBuilder { }; /* append a guest builder @newcomer to @head */ -static void AppendBuilder_(struct PurgMemBuilder *head, struct PurgMemBuilder *newcomer); +static void AppendBuilder(struct PurgMemBuilder *head, struct PurgMemBuilder *newcomer); struct PurgMemBuilder *PurgMemBuilderCreate(PurgMemBuilderFunc func, void *param, const char *name) { @@ -78,7 +78,7 @@ bool PurgMemBuilderAppendFunc(struct PurgMemBuilder *builder, PurgMemBuilderFunc struct PurgMemBuilder *newcomer = PurgMemBuilderCreate(func, param, name); IF_NULL_LOG_ACTION(newcomer, "create new builder failed", return false); - AppendBuilder_(builder, newcomer); + AppendBuilder(builder, newcomer); return true; } @@ -104,16 +104,16 @@ bool PurgMemBuilderAppendBuilder(struct PurgMemBuilder *builder, struct PurgMemB IF_NULL_LOG_ACTION(builder, "input builder is NULL", return false); IF_NULL_LOG_ACTION(newcomer, "input newcomer is NULL", return false); - AppendBuilder_(builder, newcomer); + AppendBuilder(builder, newcomer); return true; } /* append a guest builder @newcomer to @head */ -static void AppendBuilder_(struct PurgMemBuilder *head, struct PurgMemBuilder *newcomer) +static void AppendBuilder(struct PurgMemBuilder *head, struct PurgMemBuilder *newcomer) { if (!head->nextBuilder) { head->nextBuilder = newcomer; return; } - return AppendBuilder_(head->nextBuilder, newcomer); + return AppendBuilder(head->nextBuilder, newcomer); } diff --git a/libpurgeablemem/c/src/purgeable_mem_c.c b/libpurgeablemem/c/src/purgeable_mem_c.c index a9dd887fe56903479360be4076edf0d17d2253c6..2c150ca05f8453b4bea873523e16b5c915592908 100644 --- a/libpurgeablemem/c/src/purgeable_mem_c.c +++ b/libpurgeablemem/c/src/purgeable_mem_c.c @@ -39,7 +39,7 @@ struct PurgMem { unsigned int buildDataCount; }; -static inline void LogPurgMemInfo_(struct PurgMem *obj) +static inline void LogPurgMemInfo(struct PurgMem *obj) { PM_HILOG_INFO_C(LOG_CORE, "purgMemObj(%{public}lx) dataPtr(%{public}lx) dataSizeInput(%{public}zu)" " builderPtr(%{public}lx) uxpt(%{public}lx)", @@ -59,7 +59,7 @@ static inline size_t RoundUp(size_t val, size_t align) return ((val + align - 1) / align) * align; } -static bool IsPurgMemPtrValid_(struct PurgMem *purgObj); +static bool IsPurgMemPtrValid(struct PurgMem *purgObj); static bool IsPurged(struct PurgMem *purgObj); static struct PurgMem *PurgMemCreate_(size_t len, struct PurgMemBuilder *builder) @@ -101,8 +101,8 @@ static struct PurgMem *PurgMemCreate_(size_t len, struct PurgMemBuilder *builder pugObj->dataSizeInput = len; pugObj->buildDataCount = 0; - PM_HILOG_INFO_C(LOG_CORE, "%{public}s: LogPurgMemInfo_:", __func__); - LogPurgMemInfo_(pugObj); + PM_HILOG_INFO_C(LOG_CORE, "%{public}s: LogPurgMemInfo:", __func__); + LogPurgMemInfo(pugObj); return pugObj; deinit_upt: @@ -149,8 +149,8 @@ struct PurgMem *PurgMemCreate(size_t len, PurgMemModifyFunc func, void *funcPara bool PurgMemDestroy(struct PurgMem *purgObj) { IF_NULL_LOG_ACTION(purgObj, "input is NULL", return true); - PM_HILOG_INFO_C(LOG_CORE, "%{public}s: LogPurgMemInfo_:", __func__); - LogPurgMemInfo_(purgObj); + PM_HILOG_INFO_C(LOG_CORE, "%{public}s: LogPurgMemInfo:", __func__); + LogPurgMemInfo(purgObj); PMState err = PM_OK; /* destroy rwlock */ @@ -205,7 +205,7 @@ bool PurgMemDestroy(struct PurgMem *purgObj) return false; } -static bool IsPurgMemPtrValid_(struct PurgMem *purgObj) +static bool IsPurgMemPtrValid(struct PurgMem *purgObj) { IF_NULL_LOG_ACTION(purgObj, "obj is NULL", return false); IF_NULL_LOG_ACTION(purgObj->dataPtr, "dataPtr is NULL", return false); @@ -215,7 +215,7 @@ static bool IsPurgMemPtrValid_(struct PurgMem *purgObj) return true; } -static inline bool PurgMemBuildData_(struct PurgMem *purgObj) +static inline bool PurgMemBuildData(struct PurgMem *purgObj) { bool succ = false; /* clear content before rebuild */ @@ -223,7 +223,7 @@ static inline bool PurgMemBuildData_(struct PurgMem *purgObj) PM_HILOG_ERROR_C(LOG_CORE, "%{public}s, clear content fail", __func__); return succ; } - /* @purgObj->builder is not NULL since it is checked by IsPurgMemPtrValid_() before */ + /* @purgObj->builder is not NULL since it is checked by IsPurgMemPtrValid() before */ succ = PurgMemBuilderBuildAll(purgObj->builder, purgObj->dataPtr, purgObj->dataSizeInput); if (succ) { purgObj->buildDataCount++; @@ -231,7 +231,7 @@ static inline bool PurgMemBuildData_(struct PurgMem *purgObj) return succ; } -static PMState TryBeginRead_(struct PurgMem *purgObj) +static PMState TryBeginRead(struct PurgMem *purgObj) { int rwlockRet = pthread_rwlock_rdlock(&(purgObj->rwlock)); if (rwlockRet != 0) { @@ -254,7 +254,7 @@ static PMState TryBeginRead_(struct PurgMem *purgObj) return PM_DATA_PURGED; } -static PMState BeginReadBuildData_(struct PurgMem *purgObj) +static PMState BeginReadBuildData(struct PurgMem *purgObj) { bool rebuildRet = false; int rwlockRet = pthread_rwlock_wrlock(&(purgObj->rwlock)); @@ -264,7 +264,7 @@ static PMState BeginReadBuildData_(struct PurgMem *purgObj) } if (IsPurged(purgObj)) { - rebuildRet = PurgMemBuildData_(purgObj); + rebuildRet = PurgMemBuildData(purgObj); PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: purged, after built %{public}s", __func__, rebuildRet ? "succ" : "fail"); } @@ -284,17 +284,17 @@ static PMState BeginReadBuildData_(struct PurgMem *purgObj) bool PurgMemBeginRead(struct PurgMem *purgObj) { - if (!IsPurgMemPtrValid_(purgObj)) { + if (!IsPurgMemPtrValid(purgObj)) { PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: para is invalid", __func__); return false; } - PM_HILOG_INFO_C(LOG_CORE, "%{public}s: LogPurgMemInfo_:", __func__); - LogPurgMemInfo_(purgObj); + PM_HILOG_INFO_C(LOG_CORE, "%{public}s: LogPurgMemInfo:", __func__); + LogPurgMemInfo(purgObj); bool ret = false; PMState err = PM_OK; UxpteGet(purgObj->uxPageTable, (uint64_t)(purgObj->dataPtr), purgObj->dataSizeInput); while (true) { - err = TryBeginRead_(purgObj); + err = TryBeginRead(purgObj); if (err == PM_DATA_NO_PURGED) { ret = true; break; @@ -302,7 +302,7 @@ bool PurgMemBeginRead(struct PurgMem *purgObj) break; } - err = BeginReadBuildData_(purgObj); + err = BeginReadBuildData(purgObj); if (err != PMB_BUILD_ALL_SUCC) { ret = false; break; @@ -318,12 +318,12 @@ bool PurgMemBeginRead(struct PurgMem *purgObj) bool PurgMemBeginWrite(struct PurgMem *purgObj) { - if (!IsPurgMemPtrValid_(purgObj)) { + if (!IsPurgMemPtrValid(purgObj)) { PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: para is invalid", __func__); return false; } - PM_HILOG_INFO_C(LOG_CORE, "%{public}s: LogPurgMemInfo_:", __func__); - LogPurgMemInfo_(purgObj); + PM_HILOG_INFO_C(LOG_CORE, "%{public}s: LogPurgMemInfo:", __func__); + LogPurgMemInfo(purgObj); int rwlockRet = 0; bool rebuildRet = false; PMState err = PM_OK; @@ -344,7 +344,7 @@ bool PurgMemBeginWrite(struct PurgMem *purgObj) } /* data is purged */ - rebuildRet = PurgMemBuildData_(purgObj); + rebuildRet = PurgMemBuildData(purgObj); PM_HILOG_INFO_C(LOG_CORE, "%{public}s: purged, built %{public}s", __func__, rebuildRet ? "succ" : "fail"); if (rebuildRet) { return true; @@ -361,9 +361,9 @@ bool PurgMemBeginWrite(struct PurgMem *purgObj) return false; } -static inline void EndAccessPurgMem_(struct PurgMem *purgObj) +static inline void EndAccessPurgMem(struct PurgMem *purgObj) { - if (!IsPurgMemPtrValid_(purgObj)) { + if (!IsPurgMemPtrValid(purgObj)) { PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: para is invalid", __func__); return; } @@ -377,17 +377,17 @@ static inline void EndAccessPurgMem_(struct PurgMem *purgObj) void PurgMemEndRead(struct PurgMem *purgObj) { - EndAccessPurgMem_(purgObj); + EndAccessPurgMem(purgObj); } void PurgMemEndWrite(struct PurgMem *purgObj) { - EndAccessPurgMem_(purgObj); + EndAccessPurgMem(purgObj); } void *PurgMemGetContent(struct PurgMem *purgObj) { - if (!IsPurgMemPtrValid_(purgObj)) { + if (!IsPurgMemPtrValid(purgObj)) { PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: para is invalid", __func__); return NULL; } @@ -396,7 +396,7 @@ void *PurgMemGetContent(struct PurgMem *purgObj) size_t PurgMemGetContentSize(struct PurgMem *purgObj) { - if (!IsPurgMemPtrValid_(purgObj)) { + if (!IsPurgMemPtrValid(purgObj)) { PM_HILOG_ERROR_C(LOG_CORE, "%{public}s: para is invalid", __func__); return 0; } diff --git a/libpurgeablemem/common/src/ux_page_table_c.c b/libpurgeablemem/common/src/ux_page_table_c.c index 050ff248510b083a3ebcf3df584148a78180cbdc..d487a7e368772cc5ee6caebf1a989f52ce9e7133 100644 --- a/libpurgeablemem/common/src/ux_page_table_c.c +++ b/libpurgeablemem/common/src/ux_page_table_c.c @@ -53,21 +53,21 @@ static const size_t UXPTE_PER_PAGE_SHIFT = PAGE_SHIFT - UXPTE_SIZE_SHIFT; static const size_t UXPTE_PER_PAGE = 1 << UXPTE_PER_PAGE_SHIFT; /* get virtual page number from virtual address */ -static inline uint64_t VirtPageNo_(uint64_t vaddr) +static inline uint64_t VirtPageNo(uint64_t vaddr) { return vaddr >> PAGE_SHIFT; } /* page number in user page table of uxpte for virtual address */ -static inline uint64_t UxptePageNo_(uint64_t vaddr) +static inline uint64_t UxptePageNo(uint64_t vaddr) { - return VirtPageNo_(vaddr) >> UXPTE_PER_PAGE_SHIFT; + return VirtPageNo(vaddr) >> UXPTE_PER_PAGE_SHIFT; } /* uxpte offset in uxpte page for virtual address */ -static inline uint64_t UxpteOffset_(uint64_t vaddr) +static inline uint64_t UxpteOffset(uint64_t vaddr) { - return VirtPageNo_(vaddr) & (UXPTE_PER_PAGE - 1); + return VirtPageNo(vaddr) & (UXPTE_PER_PAGE - 1); } static const size_t UXPTE_PRESENT_BIT = 1; @@ -75,19 +75,19 @@ static const size_t UXPTE_PRESENT_MASK = (1 << UXPTE_PRESENT_BIT) - 1; static const size_t UXPTE_REFCNT_ONE = 1 << UXPTE_PRESENT_BIT; static const uxpte_t UXPTE_UNDER_RECLAIM = (uxpte_t)(-UXPTE_REFCNT_ONE); -static inline bool IsUxptePresent_(uxpte_t pte) +static inline bool IsUxptePresent(uxpte_t pte) { return pte & (uxpte_t)UXPTE_PRESENT_MASK; } -static inline bool IsUxpteUnderReclaim_(uxpte_t pte) +static inline bool IsUxpteUnderReclaim(uxpte_t pte) { return pte == UXPTE_UNDER_RECLAIM; } -static inline size_t GetUxPageSize_(uint64_t dataAddr, size_t dataSize) +static inline size_t GetUxPageSize(uint64_t dataAddr, size_t dataSize) { - return (UxptePageNo_(dataAddr + dataSize - 1) - UxptePageNo_(dataAddr) + 1) * PAGE_SIZE; + return (UxptePageNo(dataAddr + dataSize - 1) - UxptePageNo(dataAddr) + 1) * PAGE_SIZE; } static inline uint64_t RoundUp(uint64_t val, size_t align) @@ -102,7 +102,7 @@ static inline uint64_t RoundUp(uint64_t val, size_t align) return ((val + align - 1) / align) * align; } -static inline uint64_t RoundDown_(uint64_t val, size_t align) +static inline uint64_t RoundDown(uint64_t val, size_t align) { if (align == 0) { return val; @@ -118,16 +118,16 @@ enum UxpteOp { }; static void __attribute__((constructor)) CheckUxpt(void); -static void UxpteAdd_(uxpte_t *pte, size_t incNum); -static void UxpteSub_(uxpte_t *pte, size_t decNum); +static void UxpteAdd(uxpte_t *pte, size_t incNum); +static void UxpteSub(uxpte_t *pte, size_t decNum); -static void GetUxpteAt_(UxPageTableStruct *upt, uint64_t addr); -static void PutUxpteAt_(UxPageTableStruct *upt, uint64_t addr); -static bool IsPresentAt_(UxPageTableStruct *upt, uint64_t addr); -static PMState UxpteOps_(UxPageTableStruct *upt, uint64_t addr, size_t len, enum UxpteOp op); +static void GetUxpteAt(UxPageTableStruct *upt, uint64_t addr); +static void PutUxpteAt(UxPageTableStruct *upt, uint64_t addr); +static bool IsPresentAt(UxPageTableStruct *upt, uint64_t addr); +static PMState UxpteOps(UxPageTableStruct *upt, uint64_t addr, size_t len, enum UxpteOp op); -static uxpte_t *MapUxptePages_(uint64_t dataAddr, size_t dataSize); -static int UnmapUxptePages_(uxpte_t *ptes, size_t size); +static uxpte_t *MapUxptePages(uint64_t dataAddr, size_t dataSize); +static int UnmapUxptePages(uxpte_t *ptes, size_t size); static void __attribute__((constructor)) CheckUxpt(void) { @@ -143,8 +143,8 @@ static void __attribute__((constructor)) CheckUxpt(void) } /* try to mmap uxpt page */ type = MAP_ANONYMOUS | MAP_USEREXPTE; - size_t uptSize = GetUxPageSize_((uint64_t)dataPtr, dataSize); - void *ptes = mmap(NULL, uptSize, prot, type, -1, UxptePageNo_((uint64_t)dataPtr) * PAGE_SIZE); + size_t uptSize = GetUxPageSize((uint64_t)dataPtr, dataSize); + void *ptes = mmap(NULL, uptSize, prot, type, -1, UxptePageNo((uint64_t)dataPtr) * PAGE_SIZE); if (ptes != MAP_FAILED) { g_supportUxpt = true; /* free uxpt */ @@ -183,7 +183,7 @@ PMState InitUxPageTable(UxPageTableStruct *upt, uint64_t addr, size_t len) } upt->dataAddr = addr; upt->dataSize = len; - upt->uxpte = MapUxptePages_(upt->dataAddr, upt->dataSize); + upt->uxpte = MapUxptePages(upt->dataAddr, upt->dataSize); if (!(upt->uxpte)) { return PM_MMAP_UXPT_FAIL; } @@ -197,10 +197,10 @@ PMState DeinitUxPageTable(UxPageTableStruct *upt) HILOG_DEBUG(LOG_CORE, "%{public}s: not support uxpt", __func__); return PM_OK; } - size_t size = GetUxPageSize_(upt->dataAddr, upt->dataSize); + size_t size = GetUxPageSize(upt->dataAddr, upt->dataSize); int unmapRet = 0; if (upt->uxpte) { - unmapRet = UnmapUxptePages_(upt->uxpte, size); + unmapRet = UnmapUxptePages(upt->uxpte, size); if (unmapRet != 0) { HILOG_ERROR(LOG_CORE, "%{public}s: unmap uxpt fail", __func__); return PM_UNMAP_UXPT_FAIL; @@ -217,7 +217,7 @@ void UxpteGet(UxPageTableStruct *upt, uint64_t addr, size_t len) if (!g_supportUxpt) { return; } - UxpteOps_(upt, addr, len, UPT_GET); + UxpteOps(upt, addr, len, UPT_GET); } void UxptePut(UxPageTableStruct *upt, uint64_t addr, size_t len) @@ -225,7 +225,7 @@ void UxptePut(UxPageTableStruct *upt, uint64_t addr, size_t len) if (!g_supportUxpt) { return; } - UxpteOps_(upt, addr, len, UPT_PUT); + UxpteOps(upt, addr, len, UPT_PUT); } void UxpteClear(UxPageTableStruct *upt, uint64_t addr, size_t len) @@ -233,7 +233,7 @@ void UxpteClear(UxPageTableStruct *upt, uint64_t addr, size_t len) if (!g_supportUxpt) { return; } - UxpteOps_(upt, addr, len, UPT_CLEAR); + UxpteOps(upt, addr, len, UPT_CLEAR); } bool UxpteIsPresent(UxPageTableStruct *upt, uint64_t addr, size_t len) @@ -241,98 +241,98 @@ bool UxpteIsPresent(UxPageTableStruct *upt, uint64_t addr, size_t len) if (!g_supportUxpt) { return true; } - PMState ret = UxpteOps_(upt, addr, len, UPT_IS_PRESENT); + PMState ret = UxpteOps(upt, addr, len, UPT_IS_PRESENT); return ret == PM_OK; } -static inline uxpte_t UxpteLoad_(uxpte_t *uxpte) +static inline uxpte_t UxpteLoad(uxpte_t *uxpte) { __sync_synchronize(); return *uxpte; } -static inline bool UxpteCAS_(uxpte_t *uxpte, uxpte_t old, uxpte_t newVal) +static inline bool UxpteCAS(uxpte_t *uxpte, uxpte_t old, uxpte_t newVal) { return __sync_bool_compare_and_swap(uxpte, old, newVal); } -static void UxpteAdd_(uxpte_t *pte, size_t incNum) +static void UxpteAdd(uxpte_t *pte, size_t incNum) { uxpte_t old; do { - old = UxpteLoad_(pte); - if (IsUxpteUnderReclaim_(old)) { + old = UxpteLoad(pte); + if (IsUxpteUnderReclaim(old)) { sched_yield(); continue; } - } while (!UxpteCAS_(pte, old, old + incNum)); + } while (!UxpteCAS(pte, old, old + incNum)); } -static void UxpteSub_(uxpte_t *pte, size_t decNum) +static void UxpteSub(uxpte_t *pte, size_t decNum) { uxpte_t old; do { - old = UxpteLoad_(pte); - } while (!UxpteCAS_(pte, old, old - decNum)); + old = UxpteLoad(pte); + } while (!UxpteCAS(pte, old, old - decNum)); } static void UxpteClear_(uxpte_t *pte) { - uxpte_t old = UxpteLoad_(pte); + uxpte_t old = UxpteLoad(pte); if ((unsigned long long)old == 0) { return; /* has been set to zero */ } HILOG_ERROR(LOG_CORE, "%{public}s: upte(0x%{public}llx) != 0", __func__, (unsigned long long)old); do { - old = UxpteLoad_(pte); - } while (!UxpteCAS_(pte, old, 0)); + old = UxpteLoad(pte); + } while (!UxpteCAS(pte, old, 0)); } -static inline size_t GetIndexInUxpte_(uint64_t startAddr, uint64_t currAddr) +static inline size_t GetIndexInUxpte(uint64_t startAddr, uint64_t currAddr) { - return UxpteOffset_(startAddr) + (VirtPageNo_(currAddr) - VirtPageNo_(startAddr)); + return UxpteOffset(startAddr) + (VirtPageNo(currAddr) - VirtPageNo(startAddr)); } -static void GetUxpteAt_(UxPageTableStruct *upt, uint64_t addr) +static void GetUxpteAt(UxPageTableStruct *upt, uint64_t addr) { - size_t index = GetIndexInUxpte_(upt->dataAddr, addr); - UxpteAdd_(&(upt->uxpte[index]), UXPTE_REFCNT_ONE); + size_t index = GetIndexInUxpte(upt->dataAddr, addr); + UxpteAdd(&(upt->uxpte[index]), UXPTE_REFCNT_ONE); HILOG_DEBUG(LOG_CORE, "%{public}s: addr(0x%{public}llx) upte=0x%{public}llx", __func__, (unsigned long long)addr, (unsigned long long)(upt->uxpte[index])); } -static void PutUxpteAt_(UxPageTableStruct *upt, uint64_t addr) +static void PutUxpteAt(UxPageTableStruct *upt, uint64_t addr) { - size_t index = GetIndexInUxpte_(upt->dataAddr, addr); - UxpteSub_(&(upt->uxpte[index]), UXPTE_REFCNT_ONE); + size_t index = GetIndexInUxpte(upt->dataAddr, addr); + UxpteSub(&(upt->uxpte[index]), UXPTE_REFCNT_ONE); HILOG_DEBUG(LOG_CORE, "%{public}s: addr(0x%{public}llx) upte=0x%{public}llx", __func__, (unsigned long long)addr, (unsigned long long)(upt->uxpte[index])); } -static void ClearUxpteAt_(UxPageTableStruct *upt, uint64_t addr) +static void ClearUxpteAt(UxPageTableStruct *upt, uint64_t addr) { - size_t index = GetIndexInUxpte_(upt->dataAddr, addr); + size_t index = GetIndexInUxpte(upt->dataAddr, addr); UxpteClear_(&(upt->uxpte[index])); } -static bool IsPresentAt_(UxPageTableStruct *upt, uint64_t addr) +static bool IsPresentAt(UxPageTableStruct *upt, uint64_t addr) { - size_t index = GetIndexInUxpte_(upt->dataAddr, addr); + size_t index = GetIndexInUxpte(upt->dataAddr, addr); HILOG_DEBUG(LOG_CORE, "%{public}s: addr(0x%{public}llx) upte=0x%{public}llx PRESENT_MASK=0x%{public}zx", __func__, (unsigned long long)addr, (unsigned long long)(upt->uxpte[index]), UXPTE_PRESENT_MASK); - return IsUxptePresent_(upt->uxpte[index]); + return IsUxptePresent(upt->uxpte[index]); } -static PMState UxpteOps_(UxPageTableStruct *upt, uint64_t addr, size_t len, enum UxpteOp op) +static PMState UxpteOps(UxPageTableStruct *upt, uint64_t addr, size_t len, enum UxpteOp op) { if (upt == NULL) { return PM_BUILDER_NULL; } - uint64_t start = RoundDown_(addr, PAGE_SIZE); + uint64_t start = RoundDown(addr, PAGE_SIZE); uint64_t end = RoundUp(addr + len, PAGE_SIZE); if (start < upt->dataAddr || end > (upt->dataAddr + upt->dataSize)) { HILOG_ERROR(LOG_CORE, "%{public}s: addr(0x%{public}llx) start(0x%{public}llx) < dataAddr(0x%{public}llx)" @@ -346,19 +346,19 @@ static PMState UxpteOps_(UxPageTableStruct *upt, uint64_t addr, size_t len, enum for (uint64_t off = start; off < end; off += PAGE_SIZE) { switch (op) { case UPT_GET: { - GetUxpteAt_(upt, off); + GetUxpteAt(upt, off); break; } case UPT_PUT: { - PutUxpteAt_(upt, off); + PutUxpteAt(upt, off); break; } case UPT_CLEAR: { - ClearUxpteAt_(upt, off); + ClearUxpteAt(upt, off); break; } case UPT_IS_PRESENT: { - if (!IsPresentAt_(upt, off)) { + if (!IsPresentAt(upt, off)) { HILOG_ERROR(LOG_CORE, "%{public}s: addr(0x%{public}llx) not present", __func__, (unsigned long long)addr); return PM_UXPT_NO_PRESENT; @@ -373,12 +373,12 @@ static PMState UxpteOps_(UxPageTableStruct *upt, uint64_t addr, size_t len, enum return PM_OK; } -static uxpte_t *MapUxptePages_(uint64_t dataAddr, size_t dataSize) +static uxpte_t *MapUxptePages(uint64_t dataAddr, size_t dataSize) { int prot = PROT_READ | PROT_WRITE; int type = MAP_ANONYMOUS | MAP_USEREXPTE; - size_t size = GetUxPageSize_(dataAddr, dataSize); - uxpte_t *ptes = (uxpte_t*)mmap(NULL, size, prot, type, -1, UxptePageNo_(dataAddr) * PAGE_SIZE); + size_t size = GetUxPageSize(dataAddr, dataSize); + uxpte_t *ptes = (uxpte_t*)mmap(NULL, size, prot, type, -1, UxptePageNo(dataAddr) * PAGE_SIZE); if (ptes == MAP_FAILED) { HILOG_ERROR(LOG_CORE, "%{public}s: fail, return NULL", __func__); ptes = NULL; @@ -387,7 +387,7 @@ static uxpte_t *MapUxptePages_(uint64_t dataAddr, size_t dataSize) return ptes; } -static int UnmapUxptePages_(uxpte_t *ptes, size_t size) +static int UnmapUxptePages(uxpte_t *ptes, size_t size) { return munmap(ptes, size); } diff --git a/libpurgeablemem/cpp/include/purgeable_ashmem.h b/libpurgeablemem/cpp/include/purgeable_ashmem.h index 627e9b5bb0bd39a7a71435df0ddb18a0f384d68e..ba88aea4ac6cae5b2c2671f7d295f48ac6375221 100644 --- a/libpurgeablemem/cpp/include/purgeable_ashmem.h +++ b/libpurgeablemem/cpp/include/purgeable_ashmem.h @@ -62,7 +62,7 @@ protected: bool Unpin() override; bool IsPurged() override; int GetPinStatus() const override; - bool CreatePurgeableData_(); + bool CreatePurgeableData(); void AfterRebuildSucc() override; std::string ToString() const override; }; diff --git a/libpurgeablemem/cpp/include/purgeable_mem.h b/libpurgeablemem/cpp/include/purgeable_mem.h index 090f6f2c288d1a2d120bd1d829441fdefedae418..66ad3e457311f83d2088de656697b793cdac4062 100644 --- a/libpurgeablemem/cpp/include/purgeable_mem.h +++ b/libpurgeablemem/cpp/include/purgeable_mem.h @@ -38,7 +38,7 @@ protected: bool Unpin() override; bool IsPurged() override; int GetPinStatus() const override; - bool CreatePurgeableData_(); + bool CreatePurgeableData(); void AfterRebuildSucc() override; std::string ToString() const override; }; diff --git a/libpurgeablemem/cpp/include/purgeable_mem_base.h b/libpurgeablemem/cpp/include/purgeable_mem_base.h index aa81f402eb0733cebde2eef943f0ee54ba7aefdc..7ec423c7d8c18c758858c383678fb7eefb288999 100644 --- a/libpurgeablemem/cpp/include/purgeable_mem_base.h +++ b/libpurgeablemem/cpp/include/purgeable_mem_base.h @@ -117,8 +117,8 @@ protected: std::unique_ptr builder_ = nullptr; std::shared_mutex rwlock_; unsigned int buildDataCount_ = 0; - bool BuildContent_(); - bool IfNeedRebuild_(); + bool BuildContent(); + bool IfNeedRebuild(); virtual bool Pin(); virtual bool Unpin(); virtual bool IsPurged(); diff --git a/libpurgeablemem/cpp/src/purgeable_ashmem.cpp b/libpurgeablemem/cpp/src/purgeable_ashmem.cpp index 2529b19467c7d703a2c4ae34191fff81ee36a810..19b5076ac440f5618df10850fc149df5bddc6c32 100644 --- a/libpurgeablemem/cpp/src/purgeable_ashmem.cpp +++ b/libpurgeablemem/cpp/src/purgeable_ashmem.cpp @@ -69,7 +69,7 @@ PurgeableAshMem::PurgeableAshMem(size_t dataSize, std::unique_ptr 0 ? true : false; } -bool PurgeableAshMem::CreatePurgeableData_() +bool PurgeableAshMem::CreatePurgeableData() { PM_HILOG_DEBUG(LOG_CORE, "%{public}s", __func__); if (dataSizeInput_ == 0) { @@ -206,7 +206,7 @@ void PurgeableAshMem::ResizeData(size_t newSize) } } dataSizeInput_ = newSize; - if (!CreatePurgeableData_()) { + if (!CreatePurgeableData()) { PM_HILOG_DEBUG(LOG_CORE, "Failed to create purgeabledata"); return; } diff --git a/libpurgeablemem/cpp/src/purgeable_mem.cpp b/libpurgeablemem/cpp/src/purgeable_mem.cpp index aa17e9337ef87ff0693fd2d034a7190c45873beb..73a6ec0d05c8fcef94146542cb3e75ad0d2956fc 100644 --- a/libpurgeablemem/cpp/src/purgeable_mem.cpp +++ b/libpurgeablemem/cpp/src/purgeable_mem.cpp @@ -56,7 +56,7 @@ PurgeableMem::PurgeableMem(size_t dataSize, std::unique_ptr dataSizeInput_ = dataSize; IF_NULL_LOG_ACTION(builder, "%{public}s: input builder nullptr", return); - if (!CreatePurgeableData_()) { + if (!CreatePurgeableData()) { PM_HILOG_DEBUG(LOG_CORE, "Failed to create purgeabledata"); return; } @@ -87,7 +87,7 @@ bool PurgeableMem::IsPurged() return !(pageTable_->CheckPresent((uint64_t)dataPtr_, dataSizeInput_)); } -bool PurgeableMem::CreatePurgeableData_() +bool PurgeableMem::CreatePurgeableData() { PM_HILOG_DEBUG(LOG_CORE, "%{public}s", __func__); pageTable_ = nullptr; @@ -143,7 +143,7 @@ void PurgeableMem::ResizeData(size_t newSize) } } dataSizeInput_ = newSize; - if (!CreatePurgeableData_()) { + if (!CreatePurgeableData()) { PM_HILOG_DEBUG(LOG_CORE, "Failed to create purgeabledata"); return; } diff --git a/libpurgeablemem/cpp/src/purgeable_mem_base.cpp b/libpurgeablemem/cpp/src/purgeable_mem_base.cpp index a329b5bae3174758008018e7cae7ac04c33f85be..686130e0be24e61f9e56302bd9c6832634880654 100644 --- a/libpurgeablemem/cpp/src/purgeable_mem_base.cpp +++ b/libpurgeablemem/cpp/src/purgeable_mem_base.cpp @@ -69,7 +69,7 @@ bool PurgeableMemBase::BeginRead() err = PM_LOCK_READ_FAIL; break; } - if (!IfNeedRebuild_()) { + if (!IfNeedRebuild()) { PM_HILOG_DEBUG(LOG_CORE, "%{public}s: not purged, return true. MAP_PUR=0x%{public}x", __func__, MAP_PURGEABLE); ret = true; @@ -83,8 +83,8 @@ bool PurgeableMemBase::BeginRead() err = PM_LOCK_WRITE_FAIL; break; } - if (IfNeedRebuild_()) { - succ = BuildContent_(); + if (IfNeedRebuild()) { + succ = BuildContent(); if (succ) { AfterRebuildSucc(); } @@ -131,12 +131,12 @@ bool PurgeableMemBase::BeginWrite() err = PM_LOCK_WRITE_FAIL; break; } - if (!IfNeedRebuild_()) { + if (!IfNeedRebuild()) { /* data is not purged, return true */ break; } /* data purged, rebuild it */ - if (BuildContent_()) { + if (BuildContent()) { /* data rebuild succ, return true */ AfterRebuildSucc(); break; @@ -182,14 +182,14 @@ bool PurgeableMemBase::BeginReadWithDataLock() Pin(); PMState err = PM_OK; while (true) { - if (!IfNeedRebuild_()) { + if (!IfNeedRebuild()) { PM_HILOG_DEBUG(LOG_CORE, "%{public}s: not purged, return true. MAP_PUR=0x%{public}x", __func__, MAP_PURGEABLE); ret = true; break; } - succ = BuildContent_(); + succ = BuildContent(); if (succ) { AfterRebuildSucc(); } @@ -235,7 +235,7 @@ bool PurgeableMemBase::ModifyContentByBuilder(std::unique_ptr