diff --git a/interfaces/kits/js/backup/general_callbacks.cpp b/interfaces/kits/js/backup/general_callbacks.cpp index c7253d551f221c8bfec2f8884aced18868417afc..7d4152c7302ba53b7f3cd7aa6415710ddfe0c805 100644 --- a/interfaces/kits/js/backup/general_callbacks.cpp +++ b/interfaces/kits/js/backup/general_callbacks.cpp @@ -125,8 +125,11 @@ void BackupRestoreCallback::CallJsMethod(InputArgsParser argParser) work->data = reinterpret_cast(workArgs.get()); HILOGI("Will execute current js method"); int ret = uv_queue_work( - loop, work.get(), [](uv_work_t *work) {}, + loop, work.get(), [](uv_work_t *work) { + HILOGI("Enter, %{public}zu", (size_t)work); + }, [](uv_work_t *work, int status) { + HILOGI("AsyncWork Enter, %{public}zu", (size_t)work); auto workArgs = reinterpret_cast(work->data); do { if (workArgs == nullptr) { diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index 7f8e99ccdfa70237844a29d34dbac51c94db9f79..cbcd9fbccfc80d356cd38761fc4b0f7a971241eb 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -55,7 +55,7 @@ static void OnFileReady(weak_ptr pCallbacks, const BFileInfo & ErrCode errCode = BError::GetCodeByErrno(sysErrno); std::string errMsg = "system errno: " + to_string(sysErrno); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function backup onFileReady begin errcode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [bundleName {fileInfo.owner}, fileName {fileInfo.fileName}, fd {make_shared(fd.Release())}, errInfo](napi_env env, NError err) -> NVal { if (err) { @@ -82,6 +82,7 @@ static void OnFileReady(weak_ptr pCallbacks, const BFileInfo & NVal::DeclareNapiProperty(BConstants::URI.c_str(), NVal::CreateUTF8String(env, fileName).val_), NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); } + HILOGI("callback function backup onFileReady cbCompl end errcode: %{public}d", std::get<0>(errInfo)); return {obj}; }; @@ -108,7 +109,7 @@ static void onBundleBegin(weak_ptr pCallbacks, ErrCode err, co ErrCode errCode = BError::GetBackupCodeByErrno(err); std::string errMsg = BError::GetBackupMsgByErrno(errCode) + ", origin errno: " + to_string(err); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function backup onBundleBegin start errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [name {name}, errCode {err}, errInfo](napi_env env, NError err) -> NVal { NVal bundleName = NVal::CreateUTF8String(env, name); if (!err && errCode == 0) { @@ -127,7 +128,7 @@ static void onBundleBegin(weak_ptr pCallbacks, ErrCode err, co if (status != napi_ok) { HILOGE("Failed to set data property, status %{public}d, bundleName %{public}s", status, name.c_str()); } - + HILOGI("callback function backup onBundleBegin end errCode: %{public}d", std::get<0>(errInfo)); return res; }; @@ -154,7 +155,7 @@ static void onBundleEnd(weak_ptr pCallbacks, ErrCode err, cons ErrCode errCode = BError::GetBackupCodeByErrno(err); std::string errMsg = BError::GetBackupMsgByErrno(errCode) + ", origin errno: " + to_string(err); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function backup onBundleEnd start errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [name {name}, errCode {err}, errInfo](napi_env env, NError err) -> NVal { NVal bundleName = NVal::CreateUTF8String(env, name); if (!err && errCode == 0) { @@ -173,7 +174,7 @@ static void onBundleEnd(weak_ptr pCallbacks, ErrCode err, cons if (status != napi_ok) { HILOGE("Failed to set data property, status %{public}d, bundleName %{public}s", status, name.c_str()); } - + HILOGI("callback function backup onBundleEnd end errCode: %{public}d", std::get<0>(errInfo)); return res; }; @@ -199,7 +200,7 @@ static void onAllBundlesEnd(weak_ptr pCallbacks, ErrCode err) ErrCode errCode = BError::GetBackupCodeByErrno(err); std::string errMsg = BError::GetBackupMsgByErrno(errCode) + ", origin errno: " + to_string(err); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function backup onAllBundlesEnd begin errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [errCode {err}, errInfo](napi_env env, NError err) -> NVal { if (!err && errCode == 0) { return NVal::CreateUndefined(env); @@ -213,7 +214,7 @@ static void onAllBundlesEnd(weak_ptr pCallbacks, ErrCode err) } else { res = NVal {env, NError(errorParam).GetNapiErr(env)}; } - + HILOGI("callback function backup onAllBundlesEnd end errCode: %{public}d", std::get<0>(errInfo)); return res; }; @@ -267,6 +268,7 @@ static void OnBackupServiceDied(weak_ptr pCallbacks) } auto cbCompl = [](napi_env env, vector &argv) -> bool { + argv.push_back(nullptr); napi_value napi_res = nullptr; napi_get_undefined(env, &napi_res); argv.push_back(napi_res); 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 2596a6e6c4e26fcc7afc02ca26aa5f71242aeb2b..d33e0c5e805f51aa4684d2d39e5a9721dc7ec6fb 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -56,12 +56,10 @@ static void OnFileReady(weak_ptr pCallbacks, const BFileInfo & return; } ErrCode errCode = BError::GetCodeByErrno(sysErrno); - std::string errMsg = "system errno: " + to_string(sysErrno); - std::tuple errInfo = std::make_tuple(errCode, errMsg); - + std::tuple errInfo = std::make_tuple(errCode, "system errno: " + to_string(sysErrno)); + HILOGI("callback function incremental backup onFileReady cbCompl begin errcode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [bundleName {fileInfo.owner}, fileName {fileInfo.fileName}, - fd {make_shared(fd.Release())}, - manifestFd {make_shared(manifestFd.Release())}, + fd {make_shared(fd.Release())}, manifestFd {make_shared(manifestFd.Release())}, errInfo](napi_env env, NError err) -> NVal { if (err) { return {env, err.GetNapiErr(env)}; @@ -88,6 +86,7 @@ static void OnFileReady(weak_ptr pCallbacks, const BFileInfo & NVal::DeclareNapiProperty(BConstants::MANIFEST_FD.c_str(), NVal::CreateInt32(env, manifestFd->Release()).val_)}); } + HILOGI("callback function incremental backup onFileReady end errcode: %{public}d", std::get<0>(errInfo)); return {obj}; }; @@ -114,7 +113,7 @@ static void onBundleBegin(weak_ptr pCallbacks, ErrCode err, co ErrCode errCode = BError::GetBackupCodeByErrno(err); std::string errMsg = BError::GetBackupMsgByErrno(errCode) + ", origin errno: " + to_string(err); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function incremental backup onBundleBegin start errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [name {name}, errCode {err}, errInfo](napi_env env, NError err) -> NVal { NVal bundleName = NVal::CreateUTF8String(env, name); if (!err && errCode == 0) { @@ -133,7 +132,7 @@ static void onBundleBegin(weak_ptr pCallbacks, ErrCode err, co if (status != napi_ok) { HILOGE("Failed to set data property, status %{public}d, bundleName %{public}s", status, name.c_str()); } - + HILOGI("callback function incremental backup onBundleBegin end errCode: %{public}d", std::get<0>(errInfo)); return res; }; @@ -160,7 +159,7 @@ static void onBundleEnd(weak_ptr pCallbacks, ErrCode err, cons ErrCode errCode = BError::GetBackupCodeByErrno(err); std::string errMsg = BError::GetBackupMsgByErrno(errCode) + ", origin errno: " + to_string(err); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function incremental backup onBundleEnd start errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [name {name}, errCode {err}, errInfo](napi_env env, NError err) -> NVal { NVal bundleName = NVal::CreateUTF8String(env, name); if (!err && errCode == 0) { @@ -179,7 +178,7 @@ static void onBundleEnd(weak_ptr pCallbacks, ErrCode err, cons if (status != napi_ok) { HILOGE("Failed to set data property, status %{public}d, bundleName %{public}s", status, name.c_str()); } - + HILOGI("callback function incremental backup onBundleBegin end errCode: %{public}d", std::get<0>(errInfo)); return res; }; @@ -205,7 +204,7 @@ static void onAllBundlesEnd(weak_ptr pCallbacks, ErrCode err) ErrCode errCode = BError::GetBackupCodeByErrno(err); std::string errMsg = BError::GetBackupMsgByErrno(errCode) + ", origin errno: " + to_string(err); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function incremental backup onAllBundlesEnd begin errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [errCode {err}, errInfo](napi_env env, NError err) -> NVal { if (!err && errCode == 0) { return NVal::CreateUndefined(env); @@ -219,7 +218,7 @@ static void onAllBundlesEnd(weak_ptr pCallbacks, ErrCode err) } else { res = NVal {env, NError(errorParam).GetNapiErr(env)}; } - + HILOGI("callback function incremental backup onAllBundlesEnd end errCode: %{public}d", std::get<0>(errInfo)); return res; }; @@ -273,6 +272,7 @@ static void OnBackupServiceDied(weak_ptr pCallbacks) } auto cbCompl = [](napi_env env, vector &argv) -> bool { + argv.push_back(nullptr); napi_value napi_res = nullptr; napi_get_undefined(env, &napi_res); argv.push_back(napi_res); diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index 0d31df98ab965a1598dc50567a6a7c0b21d40126..6257637efce94b1c4743174f9bd3eb5cee7c4880 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -58,12 +58,10 @@ static void OnFileReadySheet(weak_ptr pCallbacks, const BFileI return; } ErrCode errCode = BError::GetCodeByErrno(sysErrno); - std::string errMsg = "system errno: " + to_string(sysErrno); - std::tuple errInfo = std::make_tuple(errCode, errMsg); - + std::tuple errInfo = std::make_tuple(errCode, "system errno: " + to_string(sysErrno)); + HILOGI("callback function restore onFileReadySheet begin errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [bundleName {fileInfo.owner}, fileName {fileInfo.fileName}, - fd {make_shared(fd.Release())}, - manifestFd {make_shared(manifestFd.Release())}, + fd {make_shared(fd.Release())}, manifestFd {make_shared(manifestFd.Release())}, errInfo](napi_env env, NError err) -> NVal { if (err) { return {env, err.GetNapiErr(env)}; @@ -90,6 +88,7 @@ static void OnFileReadySheet(weak_ptr pCallbacks, const BFileI NVal::DeclareNapiProperty(BConstants::MANIFEST_FD.c_str(), NVal::CreateInt32(env, manifestFd->Release()).val_)}); } + HILOGI("callback function restore onFileReadySheet end errCode: %{public}d", std::get<0>(errInfo)); return {obj}; }; @@ -116,7 +115,7 @@ static void onBundleBegin(weak_ptr pCallbacks, ErrCode err, co ErrCode errCode = BError::GetBackupCodeByErrno(err); std::string errMsg = BError::GetBackupMsgByErrno(errCode) + ", origin errno: " + to_string(err); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function restore onBundleBegin start errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [name {name}, errCode {err}, errInfo](napi_env env, NError err) -> NVal { NVal bundleName = NVal::CreateUTF8String(env, name); if (!err && errCode == 0) { @@ -135,7 +134,7 @@ static void onBundleBegin(weak_ptr pCallbacks, ErrCode err, co if (status != napi_ok) { HILOGE("Failed to set data property, status %{public}d, bundleName %{public}s", status, name.c_str()); } - + HILOGI("callback function restore onBundleBegin end errCode: %{public}d", std::get<0>(errInfo)); return res; }; @@ -162,7 +161,7 @@ static void onBundleEnd(weak_ptr pCallbacks, ErrCode err, cons ErrCode errCode = BError::GetBackupCodeByErrno(err); std::string errMsg = BError::GetBackupMsgByErrno(errCode) + ", origin errno: " + to_string(err); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function restore onBundleEnd start errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [name {name}, errCode {err}, errInfo](napi_env env, NError err) -> NVal { NVal bundleName = NVal::CreateUTF8String(env, name); if (!err && errCode == 0) { @@ -181,7 +180,7 @@ static void onBundleEnd(weak_ptr pCallbacks, ErrCode err, cons if (status != napi_ok) { HILOGE("Failed to set data property, status %{public}d, bundleName %{public}s", status, name.c_str()); } - + HILOGI("callback function restore onBundleEnd end errCode: %{public}d", std::get<0>(errInfo)); return res; }; @@ -207,7 +206,7 @@ static void onAllBundlesEnd(weak_ptr pCallbacks, ErrCode err) ErrCode errCode = BError::GetBackupCodeByErrno(err); std::string errMsg = BError::GetBackupMsgByErrno(errCode) + ", origin errno: " + to_string(err); std::tuple errInfo = std::make_tuple(errCode, errMsg); - + HILOGI("callback function restore onAllBundlesEnd begin errCode: %{public}d", std::get<0>(errInfo)); auto cbCompl = [errCode {err}, errInfo](napi_env env, NError err) -> NVal { if (!err && errCode == 0) { return NVal::CreateUndefined(env); @@ -221,7 +220,7 @@ static void onAllBundlesEnd(weak_ptr pCallbacks, ErrCode err) } else { res = NVal {env, NError(errorParam).GetNapiErr(env)}; } - + HILOGI("callback function backup onAllBundlesEnd end errCode: %{public}d", std::get<0>(errInfo)); return res; }; @@ -246,6 +245,7 @@ static void OnBackupServiceDied(weak_ptr pCallbacks) } auto cbCompl = [](napi_env env, vector &argv) -> bool { + argv.push_back(nullptr); napi_value napi_res = nullptr; napi_get_undefined(env, &napi_res); argv.push_back(napi_res);