From a414dcc90a2460a1c4051878d769f24ff2dd4e86 Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 10 Apr 2025 15:40:03 +0800 Subject: [PATCH 1/2] fdfix Signed-off-by: chensihan --- .../kits/js/backup/session_backup_n_exporter.cpp | 10 +++++----- .../backup/session_incremental_backup_n_exporter.cpp | 10 +++++----- .../kits/js/backup/session_restore_n_exporter.cpp | 12 ++++++------ services/backup_sa/src/module_ipc/service.cpp | 2 +- utils/src/b_filesystem/b_dir.cpp | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index f331a15f3..b4091184f 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -418,18 +418,18 @@ napi_value SessionBackupNExporter::GetLocalCapabilities(napi_env env, napi_callb NError(BError(BError::Codes::SDK_INVAL_ARG, "Failed to get backupSession entity.").GetCode()).ThrowErr(env); return nullptr; } - UniqueFd fd; - auto cbExec = [session {backupEntity->session.get()}, &fd]() -> NError { + auto fd = make_shared(); + auto cbExec = [session {backupEntity->session.get()}, fd]() -> NError { if (!session) { return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } - fd = session->GetLocalCapabilities(); + *fd = session->GetLocalCapabilities(); return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); }; - auto cbCompl = [&fd](napi_env env, NError err) -> NVal { + auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); - obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd.Release()).val_)}); + obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); return err ? NVal {env, err.GetNapiErr(env)} : obj; }; NVal thisVar(env, funcArg.GetThisVar()); diff --git a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp index 5d61b6db4..e2c7756c7 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -421,18 +421,18 @@ napi_value SessionIncrementalBackupNExporter::GetLocalCapabilities(napi_env env, NError(BError(BError::Codes::SDK_INVAL_ARG, "Failed to get backupSession entity.").GetCode()).ThrowErr(env); return nullptr; } - UniqueFd fd; - auto cbExec = [session {backupEntity->session.get()}, &fd]() -> NError { + auto fd = make_shared(); + auto cbExec = [session {backupEntity->session.get()}, fd]() -> NError { if (!session) { return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } - fd = session->GetLocalCapabilities(); + *fd = session->GetLocalCapabilities(); return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); }; - auto cbCompl = [&fd](napi_env env, NError err) -> NVal { + auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); - obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd.Release()).val_)}); + obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); return err ? NVal {env, err.GetNapiErr(env)} : obj; }; NVal thisVar(env, funcArg.GetThisVar()); diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index bb507b410..2595c1638 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -508,22 +508,22 @@ napi_value SessionRestoreNExporter::GetLocalCapabilities(napi_env env, napi_call NError(BError(BError::Codes::SDK_INVAL_ARG, "Failed to get restoreSession entity.").GetCode()).ThrowErr(env); return nullptr; } - UniqueFd fd; - auto cbExec = [session {restoreEntity}, &fd]() -> NError { + auto fd = make_shared(); + auto cbExec = [session {restoreEntity}, fd]() -> NError { if (!session && (session->sessionWhole || session->sessionSheet)) { return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } if (session->sessionWhole) { - fd = session->sessionWhole->GetLocalCapabilities(); + *fd = session->sessionWhole->GetLocalCapabilities(); } else if (session->sessionSheet) { - fd = session->sessionSheet->GetLocalCapabilities(); + *fd = session->sessionSheet->GetLocalCapabilities(); } return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); }; - auto cbCompl = [&fd](napi_env env, NError err) -> NVal { + auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); - obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd.Release()).val_)}); + obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); return err ? NVal {env, err.GetNapiErr(env)} : obj; }; NVal thisVar(env, funcArg.GetThisVar()); diff --git a/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index 2c00bcc51..e9ab1c1ae 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -1653,7 +1653,7 @@ ErrCode Service::GetBackupInfo(const BundleName &bundleName, std::string &result return BError(BError::Codes::SA_INVAL_ARG); } if (session_->GetImpl().clientToken) { - return BError(BError::Codes::SA_REFUSED_ACT, "Already have an active session"); + HILOGI("Already have an active session, bundleName:%{public}s", bundleName.c_str()); } session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); auto ret = GetBackupInfoCmdHandle(bundleName, result); diff --git a/utils/src/b_filesystem/b_dir.cpp b/utils/src/b_filesystem/b_dir.cpp index 2845338e4..9c2d44f01 100644 --- a/utils/src/b_filesystem/b_dir.cpp +++ b/utils/src/b_filesystem/b_dir.cpp @@ -296,8 +296,8 @@ tuple, map> BDir::GetBigFiles( HILOGW("GetBigFiles, path = %{public}s", item.c_str()); auto [errCode, files, smallFiles] = GetDirFilesDetail(item, true, BConstants::BIG_FILE_BOUNDARY); if (errCode == 0) { - incFiles.merge(move(files)); HILOGW("big files: %{public}zu; small files: %{public}zu", files.size(), smallFiles.size()); + incFiles.merge(move(files)); incSmallFiles.merge(move(smallFiles)); } } -- Gitee From 719926808d74644287f29a024d147f29e7e4ae18 Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 10 Apr 2025 16:40:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=20Signed-off-by:=20chensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interfaces/kits/js/backup/session_backup_n_exporter.cpp | 5 ++--- .../kits/js/backup/session_incremental_backup_n_exporter.cpp | 5 ++--- interfaces/kits/js/backup/session_restore_n_exporter.cpp | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index b4091184f..c04ef6664 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -424,13 +424,12 @@ napi_value SessionBackupNExporter::GetLocalCapabilities(napi_env env, napi_callb return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } *fd = session->GetLocalCapabilities(); - return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : - NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); + return NError(ERRNO_NOERR); }; auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); - return err ? NVal {env, err.GetNapiErr(env)} : obj; + return {obj}; }; NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; diff --git a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp index e2c7756c7..05912440e 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -427,13 +427,12 @@ napi_value SessionIncrementalBackupNExporter::GetLocalCapabilities(napi_env env, return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } *fd = session->GetLocalCapabilities(); - return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : - NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); + return NError(ERRNO_NOERR); }; auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); - return err ? NVal {env, err.GetNapiErr(env)} : obj; + return {obj}; }; NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index 2595c1638..ef6ddf6df 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -518,13 +518,12 @@ napi_value SessionRestoreNExporter::GetLocalCapabilities(napi_env env, napi_call } else if (session->sessionSheet) { *fd = session->sessionSheet->GetLocalCapabilities(); } - return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : - NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); + return NError(ERRNO_NOERR); }; auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); - return err ? NVal {env, err.GetNapiErr(env)} : obj; + return {obj}; }; NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; -- Gitee