diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index 610664f4c0527e756190e47bfd3ee68a3fbb1851..7824d9eec33fb23ce0c3aea0f7df23a322234103 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,7 +117,9 @@ static int SendFileCore(std::unique_ptr srcFdg, return errno; } if (infos != nullptr && infos->taskSignal != nullptr) { + HILOGE("lixiang copy cancel in "); if (infos->taskSignal->CheckCancelIfNeed(infos->srcPath)) { + HILOGE("lixiang copy cancel in 2"); return ECANCELED; } } @@ -868,6 +872,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 4700448d26139396a7eb2191a5aa9c1692c717da..d778cd2008443b55e986f28fc77df4122c41f5dd 100644 --- a/interfaces/kits/native/task_signal/task_signal.cpp +++ b/interfaces/kits/native/task_signal/task_signal.cpp @@ -25,7 +25,7 @@ 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"); @@ -33,9 +33,9 @@ int32_t TaskSignal::Cancel() } auto ret = Storage::DistributedFile::DistributedFileDaemonManager::GetInstance(). CancelCopyTask(sessionName_); - HILOGD("taskSignal.cancel sessionName = %{public}s", sessionName_.c_str()); + HILOGE("taskSignal.cancel sessionName = %{public}s", sessionName_.c_str()); if (ret != 0) { - HILOGI("CancelCopyTask failed, ret = %{public}d", ret); + HILOGE("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(); } } @@ -69,6 +70,7 @@ bool TaskSignal::CheckCancelIfNeed(const std::string &path) if (!needCancel_.load()) { return false; } + HILOGE("lixiang needcancel"); OnCancel(); return true; } @@ -80,7 +82,7 @@ void TaskSignal::MarkRemoteTask() void TaskSignal::SetFileInfoOfRemoteTask(const std::string &sessionName, const std::string &filePath) { - HILOGD("SetFileInfoOfRemoteTask sessionName = %{public}s", sessionName.c_str()); + HILOGE("SetFileInfoOfRemoteTask sessionName = %{public}s", sessionName.c_str()); sessionName_ = sessionName; filePath_ = filePath; }