diff --git a/README.md b/README.md
index 1f4c69f2b980c2af750a5c9a4b83960d84d280fa..9e7e3a00de888d1cbaa009676eb49094d7d4bb4a 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ It provides management interfaces for speculative-type memory. It is mainly used
System developers can add or remove this part by configuring the product definition JSON file under **/productdefine/common/products** to enable or disable this part:
-` "utils:utils_memory":{} `
+` "commonlibrary:memory_utils":{} `
## Repositories Involved
diff --git a/README_ZH.md b/README_ZH.md
index b69b35f0ca41f5fff97f84d7cb362110b6dcd0c5..f03a8ba3143c97c4d3684744ae3307d52b60a616 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -73,7 +73,7 @@
系统开发者可以通过配置productdefine/common/products下的产品定义json文件，增加或移除本部件，来启用或停用本部件。
-` "utils:utils_memory":{} `
+` "commonlibrary:memory_utils":{} `
## 相关仓
diff --git a/bundle.json b/bundle.json
index 17cce0ae6a7c323969898ffa939453b8266674c1..f2e5f75c844b214de5476fb1e9a4afe90092cea1 100644
--- a/bundle.json
+++ b/bundle.json
@@ -1,5 +1,5 @@
{
- "name": "@ohos/utils_memory",
+ "name": "@ohos/commonlibrary_memory_utils",
"version": "3.1.0",
"description": "memory base libraries",
"publishAs": "source",
@@ -8,8 +8,8 @@
"repository": "",
"license": "Apache License 2.0",
"component": {
- "name": "utils_memory",
- "subsystem": "utils",
+ "name": "memory_utils",
+ "subsystem": "commonlibrary",
"adapted_system_type": [ "standard" ],
"deps": {
"components": [
@@ -20,13 +20,13 @@
},
"build": {
"sub_component": [
- "//utils/memory/libdmabufheap:libdmabufheap",
- "//utils/memory/libpurgeablemem:libpurgeablemem"
+ "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap",
+ "//commonlibrary/memory_utils/libpurgeablemem:libpurgeablemem"
],
"inner_kits": [],
"test": [
- "//utils/memory/libdmabufheap/test:unittest",
- "//utils/memory/libpurgeablemem/test:libpurgeablemem_test"
+ "//commonlibrary/memory_utils/libdmabufheap/test:unittest",
+ "//commonlibrary/memory_utils/libpurgeablemem/test:libpurgeablemem_test"
]
}
}
diff --git a/libdmabufheap/BUILD.gn b/libdmabufheap/BUILD.gn
index ea42273c8bca5823992ad8116bd7cd8ee241c9e3..4237dc164a840dff8e704ebc6cd220ac6b546182 100644
--- a/libdmabufheap/BUILD.gn
+++ b/libdmabufheap/BUILD.gn
@@ -25,6 +25,6 @@ ohos_shared_library("libdmabufheap") {
"hiviewdfx_hilog_native:libhilog",
]
public_configs = [ ":libdmabufheap_config" ]
- subsystem_name = "utils"
- part_name = "utils_memory"
+ subsystem_name = "commonlibrary"
+ part_name = "memory_utils"
}
diff --git a/libdmabufheap/test/BUILD.gn b/libdmabufheap/test/BUILD.gn
index 7aceed651fcaed978b857f570ed93a089c2e5fcb..55dad046c7dae372ba7d8baf00d0526f77d13fd4 100644
--- a/libdmabufheap/test/BUILD.gn
+++ b/libdmabufheap/test/BUILD.gn
@@ -18,7 +18,7 @@ module_output_path = "libdmabufheap/"
ohos_unittest("DmabufAllocTest") {
module_out_path = module_output_path
sources = [ "unittest/libdmabufheap/dmabuf_alloc_test.cpp" ]
- deps = [ "//utils/memory/libdmabufheap:libdmabufheap" ]
+ deps = [ "//commonlibrary/memory_utils/libdmabufheap:libdmabufheap" ]
external_deps = [ "c_utils:utils" ]
}
diff --git a/libpurgeablemem/BUILD.gn b/libpurgeablemem/BUILD.gn
index a43d62f2166b67d19e01810d50259d82ae8cbb62..41f682f328d0d3721439e2ae51c21c1de4fb7217 100644
--- a/libpurgeablemem/BUILD.gn
+++ b/libpurgeablemem/BUILD.gn
@@ -38,6 +38,6 @@ ohos_shared_library("libpurgeablemem") {
"hiviewdfx_hilog_native:libhilog",
]
public_configs = [ ":libpurgeable_config" ]
- subsystem_name = "utils"
- part_name = "utils_memory"
+ subsystem_name = "commonlibrary"
+ part_name = "memory_utils"
}
diff --git a/libpurgeablemem/test/BUILD.gn b/libpurgeablemem/test/BUILD.gn
index a63819128d49dee7cc392a18b8961eb50da552dd..5bc7e9d87a5ca4357ac1b8e59a64964c92b9307a 100644
--- a/libpurgeablemem/test/BUILD.gn
+++ b/libpurgeablemem/test/BUILD.gn
@@ -19,7 +19,7 @@ module_output_path = "libpurgeablemem/"
purgeable_deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
- "//utils/memory/libpurgeablemem:libpurgeablemem",
+ "//commonlibrary/memory_utils/libpurgeablemem:libpurgeablemem",
]
purgeable_external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
@@ -35,8 +35,8 @@ ohos_unittest("purgeable_c_test") {
public_deps = purgeable_public_deps
}
- subsystem_name = "utils"
- part_name = "utils_memory"
+ subsystem_name = "commonlibrary"
+ part_name = "memory_utils"
}
ohos_unittest("purgeable_cpp_test") {
@@ -48,8 +48,8 @@ ohos_unittest("purgeable_cpp_test") {
public_deps = purgeable_public_deps
}
- subsystem_name = "utils"
- part_name = "utils_memory"
+ subsystem_name = "commonlibrary"
+ part_name = "memory_utils"
}
group("libpurgeablemem_test") {
diff --git a/libpurgeablemem/test/purgeable_c_test.cpp b/libpurgeablemem/test/purgeable_c_test.cpp
index ae6fd3fb77b2989aa90dc9644029641058ec1203..b2c2f0f77331d09d5f06611dd84a8e46ec3b0acd 100644
--- a/libpurgeablemem/test/purgeable_c_test.cpp
+++ b/libpurgeablemem/test/purgeable_c_test.cpp
@@ -14,6 +14,7 @@
*/
#include
+#include
#include
#include "gtest/gtest.h"
@@ -77,24 +78,24 @@ HWTEST_F(PurgeableCTest, MultiObjCreateTest, TestSize.Level1)
struct PurgMem *pobj1 = PurgMemCreate(27, InitAlphabet, &initPara);
LoopPrintAlphabet(pobj1, 1);
struct AlphabetModifyParam a2b = {'A', 'B'};
- ModifyPurgMemByFunc(pobj1, ModifyAlphabetX2Y, (void *)&a2b);
+ ModifyPurgMemByFunc(pobj1, ModifyAlphabetX2Y, static_cast(&a2b));
LoopPrintAlphabet(pobj1, 1);
LoopReclaimPurgeable(1);
struct PurgMem *pobj2 = PurgMemCreate(27, InitAlphabet, &initPara);
LoopPrintAlphabet(pobj2, 1);
- ModifyPurgMemByFunc(pobj2, ModifyAlphabetX2Y, (void *)&a2b);
+ ModifyPurgMemByFunc(pobj2, ModifyAlphabetX2Y, static_cast(&a2b));
LoopPrintAlphabet(pobj2, 1);
if (PurgMemBeginRead(pobj1)) {
- ASSERT_STREQ(alphabetFinal, (char *)PurgMemGetContent(pobj1));
+ ASSERT_STREQ(alphabetFinal, static_cast(PurgMemGetContent(pobj1)));
PurgMemEndRead(pobj1);
} else {
std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl;
}
if (PurgMemBeginRead(pobj2)) {
- ASSERT_STREQ(alphabetFinal, (char *)PurgMemGetContent(pobj2));
+ ASSERT_STREQ(alphabetFinal, static_cast(PurgMemGetContent(pobj2)));
PurgMemEndRead(pobj2);
} else {
std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl;
@@ -109,7 +110,7 @@ HWTEST_F(PurgeableCTest, ReadTest, TestSize.Level1)
const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ\0";
struct AlphabetInitParam initPara = {'A', 'Z'};
struct PurgMem *pobj = PurgMemCreate(27, InitAlphabet, &initPara);
- std::thread reclaimThread(LoopReclaimPurgeable, (unsigned int)(-1));
+ std::thread reclaimThread(LoopReclaimPurgeable, UINT_MAX);
pthread_t reclaimPid = reclaimThread.native_handle();
reclaimThread.detach();
@@ -120,7 +121,7 @@ HWTEST_F(PurgeableCTest, ReadTest, TestSize.Level1)
std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl;
continue;
}
- ASSERT_STREQ(alphabet, (char *)PurgMemGetContent(pobj));
+ ASSERT_STREQ(alphabet, static_cast(PurgMemGetContent(pobj)));
PurgMemEndRead(pobj);
}
@@ -133,17 +134,17 @@ HWTEST_F(PurgeableCTest, WriteTest, TestSize.Level1)
const char alphabet[] = "CCCDEFGHIJKLMNOPQRSTUVWXYZ\0";
struct AlphabetInitParam initPara = {'A', 'Z'};
struct PurgMem *pobj = PurgMemCreate(27, InitAlphabet, &initPara);
- std::thread reclaimThread(LoopReclaimPurgeable, (unsigned int)(-1));
+ std::thread reclaimThread(LoopReclaimPurgeable, UINT_MAX);
pthread_t reclaimPid = reclaimThread.native_handle();
reclaimThread.detach();
struct AlphabetModifyParam a2b = {'A', 'B'};
struct AlphabetModifyParam b2c = {'B', 'C'};
- ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&a2b);
- ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&b2c);
+ ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&a2b));
+ ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&b2c));
if (PurgMemBeginRead(pobj)) {
- ASSERT_STREQ(alphabet, (char *)PurgMemGetContent(pobj));
+ ASSERT_STREQ(alphabet, static_cast(PurgMemGetContent(pobj)));
PurgMemEndRead(pobj);
} else {
std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl;
@@ -160,23 +161,23 @@ HWTEST_F(PurgeableCTest, ReadWriteTest, TestSize.Level1)
struct AlphabetInitParam initPara = {'A', 'Z'};
struct PurgMem *pobj = PurgMemCreate(27, InitAlphabet, &initPara);
/* loop reclaim thread */
- std::thread reclaimThread(LoopReclaimPurgeable, (unsigned int)(-1));
+ std::thread reclaimThread(LoopReclaimPurgeable, UINT_MAX);
pthread_t reclaimPid = reclaimThread.native_handle();
reclaimThread.detach();
/* loop read thread */
- std::thread readThread(LoopPrintAlphabet, pobj, (unsigned int)(-1));
+ std::thread readThread(LoopPrintAlphabet, pobj, UINT_MAX);
pthread_t readPid = readThread.native_handle();
readThread.detach();
struct AlphabetModifyParam a2b = {'A', 'B'};
struct AlphabetModifyParam b2c = {'B', 'C'};
struct AlphabetModifyParam c2d = {'C', 'D'};
- ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&a2b);
- ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&b2c);
- ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, (void *)&c2d);
+ ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&a2b));
+ ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&b2c));
+ ModifyPurgMemByFunc(pobj, ModifyAlphabetX2Y, static_cast(&c2d));
if (PurgMemBeginRead(pobj)) {
- ASSERT_STREQ(alphabet, (char *)PurgMemGetContent(pobj));
+ ASSERT_STREQ(alphabet, static_cast(PurgMemGetContent(pobj)));
PurgMemEndRead(pobj);
} else {
std::cout << __func__ << ": ERROR! BeginRead failed." << std::endl;
diff --git a/libpurgeablemem/test/purgeable_cpp_test.cpp b/libpurgeablemem/test/purgeable_cpp_test.cpp
index afc2dc783f990a30192d6049b2d22d4886bb5f34..218c51323a7ba5f1df570623f9c1ff61f685d630 100644
--- a/libpurgeablemem/test/purgeable_cpp_test.cpp
+++ b/libpurgeablemem/test/purgeable_cpp_test.cpp
@@ -16,7 +16,7 @@
#include
#include
#include /* unique_ptr */
-#include
+#include
#include "gtest/gtest.h"
#include "purgeable_mem.h"
@@ -46,7 +46,7 @@ public:
if (size <= 0) {
return true;
}
- char *str = (char *)data;
+ char *str = static_cast(data);
size_t len = 0;
for (char ch = start; ch <= end && len < size; ch++) {
str[len++] = ch;
@@ -76,7 +76,7 @@ public:
bool Build(void *data, size_t size)
{
- char *str = (char *)data;
+ char *str = static_cast(data);
for (size_t i = 0; str[i] && i < size; i++) {
if (str[i] == from) {
str[i] = to;
@@ -106,7 +106,7 @@ public:
if (size <= 0) {
return true;
}
- char *str = (char *)data;
+ char *str = static_cast(data);
size_t len = 0;
for (char ch = target; len < size;) {
str[len++] = ch;
@@ -174,7 +174,7 @@ HWTEST_F(PurgeableCppTest, MultiObjCreateTest, TestSize.Level1)
int times2 = 0;
while (times1++ < 10) {
if (pobj1.BeginRead()) {
- ret1 = strncmp(alphabetFinal, (char *)(pobj1.GetContent()), 26);
+ ret1 = strncmp(alphabetFinal, static_cast(pobj1.GetContent()), 26);
pobj1.EndRead();
break;
} else {
@@ -184,7 +184,7 @@ HWTEST_F(PurgeableCppTest, MultiObjCreateTest, TestSize.Level1)
while (times2++ < 10) {
if (pobj2.BeginRead()) {
- ret2 = strncmp(alphabetFinal, (char *)(pobj2.GetContent()), 26);
+ ret2 = strncmp(alphabetFinal, static_cast(pobj2.GetContent()), 26);
pobj2.EndRead();
break;
} else {
@@ -207,7 +207,7 @@ HWTEST_F(PurgeableCppTest, ReadTest, TestSize.Level1)
int ret = 1;
while (times++ < 10) {
if (pobj->BeginRead()) {
- ret = strncmp(alphabet, (char *)(pobj->GetContent()), 26);
+ ret = strncmp(alphabet, static_cast(pobj->GetContent()), 26);
pobj->EndRead();
break;
} else {
@@ -235,7 +235,7 @@ HWTEST_F(PurgeableCppTest, WriteTest, TestSize.Level1)
int ret = 1;
while (times++ < 10) {
if (pobj->BeginRead()) {
- ret = strncmp(alphabet, (char *)(pobj->GetContent()), 26);
+ ret = strncmp(alphabet, static_cast(pobj->GetContent()), 26);
pobj->EndRead();
break;
} else {
@@ -267,7 +267,7 @@ HWTEST_F(PurgeableCppTest, ReadWriteTest, TestSize.Level1)
int ret = 1;
while (times++ < 10) {
if (pobj->BeginRead()) {
- ret = strncmp(alphabet, (char *)(pobj->GetContent()), 26);
+ ret = strncmp(alphabet, static_cast(pobj->GetContent()), 26);
pobj->EndRead();
break;
} else {
@@ -296,7 +296,7 @@ HWTEST_F(PurgeableCppTest, MutiPageReadTest, TestSize.Level1)
int ret = 1;
while (times++ < 10) {
if (pobj->BeginRead()) {
- ret = strncmp(alphabet, (char *)(pobj->GetContent()), 4097);
+ ret = strncmp(alphabet, static_cast(pobj->GetContent()), 4097);
pobj->EndRead();
break;
} else {
@@ -330,7 +330,7 @@ HWTEST_F(PurgeableCppTest, MutiPageWriteTest, TestSize.Level1)
int ret = 1;
while (times++ < 10) {
if (pobj->BeginRead()) {
- ret = strncmp(alphabet, (char *)(pobj->GetContent()), 4097);
+ ret = strncmp(alphabet, static_cast(pobj->GetContent()), 4097);
pobj->EndRead();
break;
} else {
@@ -366,7 +366,7 @@ HWTEST_F(PurgeableCppTest, MutiPageReadWriteTest, TestSize.Level1)
int ret = 1;
while (times++ < 10) {
if (pobj->BeginRead()) {
- ret = strncmp(alphabet, (char *)(pobj->GetContent()), 4097);
+ ret = strncmp(alphabet, static_cast(pobj->GetContent()), 4097);
pobj->EndRead();
break;
} else {
@@ -404,7 +404,7 @@ HWTEST_F(PurgeableCppTest, MutiMorePageReadWriteTest, TestSize.Level1)
int ret = 1;
while (times++ < 10) {
if (pobj->BeginRead()) {
- ret = strncmp(alphabet, (char *)(pobj->GetContent()), size - 1);
+ ret = strncmp(alphabet, static_cast(pobj->GetContent()), size - 1);
pobj->EndRead();
break;
} else {