From 36b2f9f3bf6e2332113fed852f7cab8f18288eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=AB=E5=BF=B5?= Date: Fri, 22 Aug 2025 11:52:27 +0800 Subject: [PATCH 1/3] 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 别念 --- interfaces/kits/hyperaio/src/hyperaio.cpp | 36 +++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/interfaces/kits/hyperaio/src/hyperaio.cpp b/interfaces/kits/hyperaio/src/hyperaio.cpp index 0feb8411c..c31dfe740 100644 --- a/interfaces/kits/hyperaio/src/hyperaio.cpp +++ b/interfaces/kits/hyperaio/src/hyperaio.cpp @@ -53,6 +53,24 @@ static bool HasAccessIouringPermission() return true; } +static std::string GetAnonyString(const std::string &value) +{ + constexpr size_t INT32_PLAINTEXT_LENGTH = 4; + constexpr size_t INT32_MIN_ID_LENGTH = 8; + std::string res; + std::string tmpStr("******"); + size_t strLen = value.length(); + if (strLen < INT32_MIN_ID_LENGTH) { + return tmpStr; + } + + res.append(value, 0, INT32_PLAINTEXT_LENGTH); + res += tmpStr; + res.append(value, strLen - INT32_PLAINTEXT_LENGTH, INT32_PLAINTEXT_LENGTH); + + return res; +} + static bool ValidateReqNum(uint32_t reqNum) { return reqNum > 0 && reqNum <= URING_QUEUE_SIZE; @@ -121,7 +139,7 @@ void HyperAio::HandleRequestError(std::vector &errorVec, int32_t error return; } for (auto &userdata : errorVec) { - HILOGE("HandleRequestError: userData = %{public}lu", userdata); + HILOGE("HandleRequestError: userData = %{private}lu", userdata); auto response = std::make_unique(userdata, errorcode, 0); ioResultCallBack_(std::move(response)); } @@ -189,10 +207,10 @@ int32_t HyperAio::StartOpenReqs(OpenReqs *req) io_uring_sqe_set_data(sqe, reinterpret_cast(openInfo->userData)); io_uring_prep_openat(sqe, openInfo->dfd, static_cast(openInfo->path), openInfo->flags, openInfo->mode); - HILOGD("open flags = %{public}d, mode = %{public}u, userData = %{public}lu", + HILOGD("open flags = %{public}d, mode = %{public}u, userData = %{private}lu", openInfo->flags, openInfo->mode, openInfo->userData); HyperaioTrace trace("open flags:" + std::to_string(openInfo->flags) + "mode:" + std::to_string(openInfo->mode) - + "userData:" + std::to_string(openInfo->userData)); + + "userData:" + getAnonyString(std::to_string(openInfo->userData))); count++; openInfoVec.push_back(openInfo->userData); if (count >= BATCH_SIZE || i == totalReqs - 1) { @@ -238,10 +256,10 @@ int32_t HyperAio::StartReadReqs(ReadReqs *req) struct ReadInfo *readInfo = &req->reqs[i]; io_uring_sqe_set_data(sqe, reinterpret_cast(readInfo->userData)); io_uring_prep_read(sqe, readInfo->fd, readInfo->buf, readInfo->len, readInfo->offset); - HILOGD("read len = %{public}u, offset = %{public}lu, userData = %{public}lu", + HILOGD("read len = %{public}u, offset = %{public}lu, userData = %{private}lu", readInfo->len, readInfo->offset, readInfo->userData); HyperaioTrace trace("read len:" + std::to_string(readInfo->len) + "offset:" + std::to_string(readInfo->offset) - + "userData:" + std::to_string(readInfo->userData)); + + "userData:" + getAnonyString(std::to_string(readInfo->userData))); count++; readInfoVec.push_back(readInfo->userData); if (count >= BATCH_SIZE || i == totalReqs - 1) { @@ -287,10 +305,10 @@ int32_t HyperAio::StartCancelReqs(CancelReqs *req) struct CancelInfo *cancelInfo = &req->reqs[i]; io_uring_sqe_set_data(sqe, reinterpret_cast(cancelInfo->userData)); io_uring_prep_cancel(sqe, reinterpret_cast(cancelInfo->targetUserData), 0); - HILOGD("cancel userData = %{public}lu, targetUserData = %{public}lu", + HILOGD("cancel userData = %{private}lu, targetUserData = %{private}lu", cancelInfo->userData, cancelInfo->targetUserData); - HyperaioTrace trace("cancel userData:" + std::to_string(cancelInfo->userData) - + "targetUserData:" + std::to_string(cancelInfo->targetUserData)); + HyperaioTrace trace("cancel userData:" + getAnonyString(std::to_string(cancelInfo->userData)) + + "targetUserData:" + getAnonyString(std::to_string(cancelInfo->targetUserData))); count++; cancelInfoVec.push_back(cancelInfo->userData); if (count >= BATCH_SIZE || i == totalReqs - 1) { @@ -325,7 +343,7 @@ void HyperAio::HarvestRes() HILOGI("cqe failed, cqe->res = %{public}d", cqe->res); } auto response = std::make_unique(cqe->user_data, cqe->res, cqe->flags); - HyperaioTrace trace("harvest: userdata " + std::to_string(cqe->user_data) + HyperaioTrace trace("harvest: userdata " + getAnonyString(std::to_string(cqe->user_data)) + " res " + std::to_string(cqe->res) + "flags " + std::to_string(cqe->flags)); io_uring_cqe_seen(&pImpl_->uring_, cqe); if (ioResultCallBack_) { -- Gitee From 5dbaeb525311fcc49352bf286b459d308588de7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=AB=E5=BF=B5?= Date: Fri, 22 Aug 2025 12:00:10 +0800 Subject: [PATCH 2/3] 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 别念 --- interfaces/kits/hyperaio/src/hyperaio.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/kits/hyperaio/src/hyperaio.cpp b/interfaces/kits/hyperaio/src/hyperaio.cpp index c31dfe740..a3d98b93b 100644 --- a/interfaces/kits/hyperaio/src/hyperaio.cpp +++ b/interfaces/kits/hyperaio/src/hyperaio.cpp @@ -63,7 +63,7 @@ static std::string GetAnonyString(const std::string &value) if (strLen < INT32_MIN_ID_LENGTH) { return tmpStr; } - + res.append(value, 0, INT32_PLAINTEXT_LENGTH); res += tmpStr; res.append(value, strLen - INT32_PLAINTEXT_LENGTH, INT32_PLAINTEXT_LENGTH); @@ -210,7 +210,7 @@ int32_t HyperAio::StartOpenReqs(OpenReqs *req) HILOGD("open flags = %{public}d, mode = %{public}u, userData = %{private}lu", openInfo->flags, openInfo->mode, openInfo->userData); HyperaioTrace trace("open flags:" + std::to_string(openInfo->flags) + "mode:" + std::to_string(openInfo->mode) - + "userData:" + getAnonyString(std::to_string(openInfo->userData))); + + "userData:" + GetAnonyString(std::to_string(openInfo->userData))); count++; openInfoVec.push_back(openInfo->userData); if (count >= BATCH_SIZE || i == totalReqs - 1) { @@ -259,7 +259,7 @@ int32_t HyperAio::StartReadReqs(ReadReqs *req) HILOGD("read len = %{public}u, offset = %{public}lu, userData = %{private}lu", readInfo->len, readInfo->offset, readInfo->userData); HyperaioTrace trace("read len:" + std::to_string(readInfo->len) + "offset:" + std::to_string(readInfo->offset) - + "userData:" + getAnonyString(std::to_string(readInfo->userData))); + + "userData:" + GetAnonyString(std::to_string(readInfo->userData))); count++; readInfoVec.push_back(readInfo->userData); if (count >= BATCH_SIZE || i == totalReqs - 1) { @@ -307,8 +307,8 @@ int32_t HyperAio::StartCancelReqs(CancelReqs *req) io_uring_prep_cancel(sqe, reinterpret_cast(cancelInfo->targetUserData), 0); HILOGD("cancel userData = %{private}lu, targetUserData = %{private}lu", cancelInfo->userData, cancelInfo->targetUserData); - HyperaioTrace trace("cancel userData:" + getAnonyString(std::to_string(cancelInfo->userData)) - + "targetUserData:" + getAnonyString(std::to_string(cancelInfo->targetUserData))); + HyperaioTrace trace("cancel userData:" + GetAnonyString(std::to_string(cancelInfo->userData)) + + "targetUserData:" + GetAnonyString(std::to_string(cancelInfo->targetUserData))); count++; cancelInfoVec.push_back(cancelInfo->userData); if (count >= BATCH_SIZE || i == totalReqs - 1) { @@ -343,7 +343,7 @@ void HyperAio::HarvestRes() HILOGI("cqe failed, cqe->res = %{public}d", cqe->res); } auto response = std::make_unique(cqe->user_data, cqe->res, cqe->flags); - HyperaioTrace trace("harvest: userdata " + getAnonyString(std::to_string(cqe->user_data)) + HyperaioTrace trace("harvest: userdata " + GetAnonyString(std::to_string(cqe->user_data)) + " res " + std::to_string(cqe->res) + "flags " + std::to_string(cqe->flags)); io_uring_cqe_seen(&pImpl_->uring_, cqe); if (ioResultCallBack_) { -- Gitee From 8deff5f4be62124a7346f69fe76fc4bfa2c4e578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=AB=E5=BF=B5?= Date: Fri, 22 Aug 2025 16:26:24 +0800 Subject: [PATCH 3/3] 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 别念 --- interfaces/kits/hyperaio/src/hyperaio.cpp | 28 ++++------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/interfaces/kits/hyperaio/src/hyperaio.cpp b/interfaces/kits/hyperaio/src/hyperaio.cpp index a3d98b93b..112649c5f 100644 --- a/interfaces/kits/hyperaio/src/hyperaio.cpp +++ b/interfaces/kits/hyperaio/src/hyperaio.cpp @@ -53,24 +53,6 @@ static bool HasAccessIouringPermission() return true; } -static std::string GetAnonyString(const std::string &value) -{ - constexpr size_t INT32_PLAINTEXT_LENGTH = 4; - constexpr size_t INT32_MIN_ID_LENGTH = 8; - std::string res; - std::string tmpStr("******"); - size_t strLen = value.length(); - if (strLen < INT32_MIN_ID_LENGTH) { - return tmpStr; - } - - res.append(value, 0, INT32_PLAINTEXT_LENGTH); - res += tmpStr; - res.append(value, strLen - INT32_PLAINTEXT_LENGTH, INT32_PLAINTEXT_LENGTH); - - return res; -} - static bool ValidateReqNum(uint32_t reqNum) { return reqNum > 0 && reqNum <= URING_QUEUE_SIZE; @@ -210,7 +192,7 @@ int32_t HyperAio::StartOpenReqs(OpenReqs *req) HILOGD("open flags = %{public}d, mode = %{public}u, userData = %{private}lu", openInfo->flags, openInfo->mode, openInfo->userData); HyperaioTrace trace("open flags:" + std::to_string(openInfo->flags) + "mode:" + std::to_string(openInfo->mode) - + "userData:" + GetAnonyString(std::to_string(openInfo->userData))); + + "userData:" + std::to_string(openInfo->userData)); count++; openInfoVec.push_back(openInfo->userData); if (count >= BATCH_SIZE || i == totalReqs - 1) { @@ -259,7 +241,7 @@ int32_t HyperAio::StartReadReqs(ReadReqs *req) HILOGD("read len = %{public}u, offset = %{public}lu, userData = %{private}lu", readInfo->len, readInfo->offset, readInfo->userData); HyperaioTrace trace("read len:" + std::to_string(readInfo->len) + "offset:" + std::to_string(readInfo->offset) - + "userData:" + GetAnonyString(std::to_string(readInfo->userData))); + + "userData:" + std::to_string(readInfo->userData)); count++; readInfoVec.push_back(readInfo->userData); if (count >= BATCH_SIZE || i == totalReqs - 1) { @@ -307,8 +289,8 @@ int32_t HyperAio::StartCancelReqs(CancelReqs *req) io_uring_prep_cancel(sqe, reinterpret_cast(cancelInfo->targetUserData), 0); HILOGD("cancel userData = %{private}lu, targetUserData = %{private}lu", cancelInfo->userData, cancelInfo->targetUserData); - HyperaioTrace trace("cancel userData:" + GetAnonyString(std::to_string(cancelInfo->userData)) - + "targetUserData:" + GetAnonyString(std::to_string(cancelInfo->targetUserData))); + HyperaioTrace trace("cancel userData:" + std::to_string(cancelInfo->userData) + + "targetUserData:" + std::to_string(cancelInfo->targetUserData)); count++; cancelInfoVec.push_back(cancelInfo->userData); if (count >= BATCH_SIZE || i == totalReqs - 1) { @@ -343,7 +325,7 @@ void HyperAio::HarvestRes() HILOGI("cqe failed, cqe->res = %{public}d", cqe->res); } auto response = std::make_unique(cqe->user_data, cqe->res, cqe->flags); - HyperaioTrace trace("harvest: userdata " + GetAnonyString(std::to_string(cqe->user_data)) + HyperaioTrace trace("harvest: userdata " + std::to_string(cqe->user_data) + " res " + std::to_string(cqe->res) + "flags " + std::to_string(cqe->flags)); io_uring_cqe_seen(&pImpl_->uring_, cqe); if (ioResultCallBack_) { -- Gitee