From 8ffaa6bf9412abc2dfadc7999f05da83f999f952 Mon Sep 17 00:00:00 2001 From: lixiang Date: Fri, 30 Aug 2024 10:22:50 +0800 Subject: [PATCH 1/3] cancel test Signed-off-by: lixiang --- interfaces/kits/js/src/mod_fs/properties/copy.cpp | 1 + interfaces/kits/native/task_signal/task_signal.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index 610664f4c..af9acd93a 100644 --- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp @@ -868,6 +868,7 @@ void Copy::CopyComplete(std::shared_ptr infos, std::shared_ptr infos = nullptr; auto result = ParseJsParam(env, funcArg, infos); diff --git a/interfaces/kits/native/task_signal/task_signal.cpp b/interfaces/kits/native/task_signal/task_signal.cpp index 4700448d2..dcb2e3761 100644 --- a/interfaces/kits/native/task_signal/task_signal.cpp +++ b/interfaces/kits/native/task_signal/task_signal.cpp @@ -25,17 +25,17 @@ using namespace FileManagement; constexpr int CANCEL_ERR = -3; int32_t TaskSignal::Cancel() { - HILOGD("TaskSignal Cancel in."); + HILOGE("lixiang TaskSignal Cancel in."); if (remoteTask_.load()) { if (sessionName_.empty()) { - HILOGE("TaskSignal::Cancel sessionName is empty"); + HILOGE("lixiang TaskSignal::Cancel sessionName is empty"); return CANCEL_ERR; } auto ret = Storage::DistributedFile::DistributedFileDaemonManager::GetInstance(). CancelCopyTask(sessionName_); - HILOGD("taskSignal.cancel sessionName = %{public}s", sessionName_.c_str()); + HILOGE("lixiang taskSignal.cancel sessionName = %{public}s", sessionName_.c_str()); if (ret != 0) { - HILOGI("CancelCopyTask failed, ret = %{public}d", ret); + HILOGE("lixiang CancelCopyTask failed, ret = %{public}d", ret); return ret; } OnCancel(); @@ -60,6 +60,7 @@ void TaskSignal::SetTaskSignalListener(TaskSignalListener *signalListener) void TaskSignal::OnCancel() { if (signalListener_ != nullptr) { + HILOGE("lixiang oncancel"); signalListener_->OnCancel(); } } @@ -80,7 +81,7 @@ void TaskSignal::MarkRemoteTask() void TaskSignal::SetFileInfoOfRemoteTask(const std::string &sessionName, const std::string &filePath) { - HILOGD("SetFileInfoOfRemoteTask sessionName = %{public}s", sessionName.c_str()); + HILOGE("lixiang SetFileInfoOfRemoteTask sessionName = %{public}s", sessionName.c_str()); sessionName_ = sessionName; filePath_ = filePath; } -- Gitee From a7262cf47a0df769a0f9d0a983277c48b87f3a21 Mon Sep 17 00:00:00 2001 From: lixiang Date: Fri, 30 Aug 2024 11:42:33 +0800 Subject: [PATCH 2/3] cancel test Signed-off-by: lixiang --- interfaces/kits/js/src/mod_fs/properties/copy.cpp | 2 ++ interfaces/kits/native/task_signal/task_signal.cpp | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index af9acd93a..865c95c39 100644 --- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp @@ -115,7 +115,9 @@ static int SendFileCore(std::unique_ptr srcFdg, return errno; } if (infos != nullptr && infos->taskSignal != nullptr) { + HILOGE("lixiang cancel in "); if (infos->taskSignal->CheckCancelIfNeed(infos->srcPath)) { + HILOGE("lixiang cancel in 2"); return ECANCELED; } } diff --git a/interfaces/kits/native/task_signal/task_signal.cpp b/interfaces/kits/native/task_signal/task_signal.cpp index dcb2e3761..d778cd200 100644 --- a/interfaces/kits/native/task_signal/task_signal.cpp +++ b/interfaces/kits/native/task_signal/task_signal.cpp @@ -28,14 +28,14 @@ int32_t TaskSignal::Cancel() HILOGE("lixiang TaskSignal Cancel in."); if (remoteTask_.load()) { if (sessionName_.empty()) { - HILOGE("lixiang TaskSignal::Cancel sessionName is empty"); + HILOGE("TaskSignal::Cancel sessionName is empty"); return CANCEL_ERR; } auto ret = Storage::DistributedFile::DistributedFileDaemonManager::GetInstance(). CancelCopyTask(sessionName_); - HILOGE("lixiang taskSignal.cancel sessionName = %{public}s", sessionName_.c_str()); + HILOGE("taskSignal.cancel sessionName = %{public}s", sessionName_.c_str()); if (ret != 0) { - HILOGE("lixiang CancelCopyTask failed, ret = %{public}d", ret); + HILOGE("CancelCopyTask failed, ret = %{public}d", ret); return ret; } OnCancel(); @@ -70,6 +70,7 @@ bool TaskSignal::CheckCancelIfNeed(const std::string &path) if (!needCancel_.load()) { return false; } + HILOGE("lixiang needcancel"); OnCancel(); return true; } @@ -81,7 +82,7 @@ void TaskSignal::MarkRemoteTask() void TaskSignal::SetFileInfoOfRemoteTask(const std::string &sessionName, const std::string &filePath) { - HILOGE("lixiang SetFileInfoOfRemoteTask sessionName = %{public}s", sessionName.c_str()); + HILOGE("SetFileInfoOfRemoteTask sessionName = %{public}s", sessionName.c_str()); sessionName_ = sessionName; filePath_ = filePath; } -- Gitee From b2bca4fcc0e7bb7f7e68f05e56d0fc5d3d67cc41 Mon Sep 17 00:00:00 2001 From: lixiang Date: Fri, 30 Aug 2024 11:52:02 +0800 Subject: [PATCH 3/3] cancel test Signed-off-by: lixiang --- interfaces/kits/js/src/mod_fs/properties/copy.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index 865c95c39..7824d9eec 100644 --- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp @@ -107,7 +107,9 @@ static int SendFileCore(std::unique_ptr srcFdg, } int32_t ret = 0; int64_t size = static_cast(srcStat.st_size); + HILOGE("lixiang aaaaaa"); while (size >= 0) { + HILOGE("lixiang bbb"); ret = uv_fs_sendfile(nullptr, sendFileReq.get(), destFdg->GetFD(), srcFdg->GetFD(), offset, MAX_SIZE, nullptr); if (ret < 0) { @@ -115,9 +117,9 @@ static int SendFileCore(std::unique_ptr srcFdg, return errno; } if (infos != nullptr && infos->taskSignal != nullptr) { - HILOGE("lixiang cancel in "); + HILOGE("lixiang copy cancel in "); if (infos->taskSignal->CheckCancelIfNeed(infos->srcPath)) { - HILOGE("lixiang cancel in 2"); + HILOGE("lixiang copy cancel in 2"); return ECANCELED; } } -- Gitee