From 0f9aaadc6a24317892f7084a2742b672c64062ce Mon Sep 17 00:00:00 2001 From: curried Date: Tue, 5 Aug 2025 19:41:28 +0800 Subject: [PATCH 1/2] replace "Hw" with "Hardware" to avoid ambiguity Signed-off-by: curried --- services/BUILD.gn | 4 +- .../hardware_fault_retry.cpp} | 28 ++++---- ...hwfault_retry.h => hardware_fault_retry.h} | 14 ++-- services/updater.cpp | 4 +- .../updater_binary/update_image_block.cpp | 2 +- .../updater_binary/update_image_patch.cpp | 2 +- services/updater_main.cpp | 8 +-- services/updater_utils.cpp | 4 +- test/unittest/BUILD.gn | 4 +- test/unittest/flashd_test/BUILD.gn | 2 +- test/unittest/service_test/BUILD.gn | 2 +- ....cpp => hardware_fault_retry_unittest.cpp} | 64 +++++++++---------- 12 files changed, 69 insertions(+), 69 deletions(-) rename services/{hwfault_retry/hwfault_retry.cpp => hardware_fault/hardware_fault_retry.cpp} (77%) rename services/include/updater/{hwfault_retry.h => hardware_fault_retry.h} (85%) rename test/unittest/updater_test/{hwfault_retry_unittest.cpp => hardware_fault_retry_unittest.cpp} (46%) diff --git a/services/BUILD.gn b/services/BUILD.gn index dd1da734..7140079e 100755 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -64,7 +64,7 @@ ohos_static_library("libupdater_static") { defines = [ "BUILD_OHOS" ] sources = [ "factory_reset/factory_reset.cpp", - "hwfault_retry/hwfault_retry.cpp", + "hardware_fault/hardware_fault_retry.cpp", "main.cpp", "updater.cpp", "updater_main.cpp", @@ -149,7 +149,7 @@ ohos_static_library("libupdater") { defines = [ "BUILD_OHOS" ] sources = [ "factory_reset/factory_reset.cpp", - "hwfault_retry/hwfault_retry.cpp", + "hardware_fault/hardware_fault_retry.cpp", "updater.cpp", "updater_preprocess.cpp", "updater_utils.cpp", diff --git a/services/hwfault_retry/hwfault_retry.cpp b/services/hardware_fault/hardware_fault_retry.cpp similarity index 77% rename from services/hwfault_retry/hwfault_retry.cpp rename to services/hardware_fault/hardware_fault_retry.cpp index e363ca43..cf31217e 100644 --- a/services/hwfault_retry/hwfault_retry.cpp +++ b/services/hardware_fault/hardware_fault_retry.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "updater/hwfault_retry.h" +#include "updater/hardware_fault_retry.h" #include #include "init_reboot.h" #include "log/log.h" @@ -24,13 +24,13 @@ #include "securec.h" namespace Updater { -HwFaultRetry &HwFaultRetry::GetInstance() +HardwareFaultRetry &HardwareFaultRetry::GetInstance() { - static HwFaultRetry instance; + static HardwareFaultRetry instance; return instance; } -HwFaultRetry::HwFaultRetry() +HardwareFaultRetry::HardwareFaultRetry() { RetryFunc rebootFunc = [this]() { return this->RebootRetry(); @@ -40,14 +40,14 @@ HwFaultRetry::HwFaultRetry() RegisterFunc(BLOCK_UPDATE_FAILED_REBOOT, rebootFunc); } -void HwFaultRetry::RegisterFunc(const std::string &faultInfo, RetryFunc func) +void HardwareFaultRetry::RegisterFunc(const std::string &faultInfo, RetryFunc func) { if (!retryMap_.emplace(faultInfo, func).second) { LOG(ERROR) << "emplace: " << faultInfo.c_str() << " fail"; } } -void HwFaultRetry::RegisterDefaultFunc(const std::string &faultInfo) +void HardwareFaultRetry::RegisterDefaultFunc(const std::string &faultInfo) { if (!retryMap_.emplace(faultInfo, [this]() { return this->RebootRetry(); @@ -56,14 +56,14 @@ void HwFaultRetry::RegisterDefaultFunc(const std::string &faultInfo) } } -void HwFaultRetry::RemoveFunc(const std::string &faultInfo) +void HardwareFaultRetry::RemoveFunc(const std::string &faultInfo) { if (retryMap_.erase(faultInfo) == 0) { LOG(ERROR) << "erase " << faultInfo.c_str() << " fail"; } } -void HwFaultRetry::DoRetryAction() +void HardwareFaultRetry::DoRetryAction() { auto it = retryMap_.find(faultInfo_); if (it == retryMap_.end() || it->second == nullptr) { @@ -73,32 +73,32 @@ void HwFaultRetry::DoRetryAction() return (it->second)(); } -void HwFaultRetry::SetFaultInfo(const std::string &faultInfo) +void HardwareFaultRetry::SetFaultInfo(const std::string &faultInfo) { faultInfo_ = faultInfo; } -void HwFaultRetry::SetRetryCount(const uint32_t count) +void HardwareFaultRetry::SetRetryCount(const uint32_t count) { retryCount_ = count; } -void HwFaultRetry::SetEffectiveValue(bool value) +void HardwareFaultRetry::SetEffectiveValue(bool value) { effective_ = value; } -void HwFaultRetry::SetRebootCmd(const std::string &rebootCmd) +void HardwareFaultRetry::SetRebootCmd(const std::string &rebootCmd) { rebootCmd_ = rebootCmd; } -bool HwFaultRetry::IsRetry(void) +bool HardwareFaultRetry::IsRetry(void) { return isRetry_; } -void HwFaultRetry::RebootRetry() +void HardwareFaultRetry::RebootRetry() { if (!effective_) { LOG(WARNING) << "Special scenarios do not take effect, not need retry."; diff --git a/services/include/updater/hwfault_retry.h b/services/include/updater/hardware_fault_retry.h similarity index 85% rename from services/include/updater/hwfault_retry.h rename to services/include/updater/hardware_fault_retry.h index 22e8599f..f272e5ba 100644 --- a/services/include/updater/hwfault_retry.h +++ b/services/include/updater/hardware_fault_retry.h @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef UPDATER_HWFAULT_RETRY_H -#define UPDATER_HWFAULT_RETRY_H +#ifndef UPDATER_HARDWARE_FAULT_RETRY_H +#define UPDATER_HARDWARE_FAULT_RETRY_H #include "log/log.h" #include @@ -22,12 +22,12 @@ #include namespace Updater { -class HwFaultRetry { +class HardwareFaultRetry { public: - HwFaultRetry(); - ~HwFaultRetry() = default; + HardwareFaultRetry(); + ~HardwareFaultRetry() = default; - static HwFaultRetry &GetInstance(); + static HardwareFaultRetry &GetInstance(); using RetryFunc = std::function; void DoRetryAction(); void RegisterFunc(const std::string &faultInfo, RetryFunc func); @@ -50,4 +50,4 @@ private: bool isRetry_ = false; }; } // Updater -#endif // UPDATER_HWFAULT_RETRY_H +#endif // UPDATER_HARDWARE_FAULT_RETRY_H diff --git a/services/updater.cpp b/services/updater.cpp index 4026a85c..98b1ac84 100644 --- a/services/updater.cpp +++ b/services/updater.cpp @@ -45,7 +45,7 @@ #include "ptable_parse/ptable_manager.h" #endif #include "scope_guard.h" -#include "updater/hwfault_retry.h" +#include "updater/hardware_fault_retry.h" #include "updater/updater_preprocess.h" #include "updater/updater_const.h" #include "updater_main.h" @@ -538,7 +538,7 @@ void HandleChildOutput(const std::string &buffer, int32_t bufferLen, bool &retry } else if (outputHeader == "retry_update") { retryUpdate = true; auto outputInfo = Trim(output[1]); - HwFaultRetry::GetInstance().SetFaultInfo(outputInfo); + HardwareFaultRetry::GetInstance().SetFaultInfo(outputInfo); } else if (outputHeader == "ui_log") { auto outputInfo = Trim(output[1]); } else if (outputHeader == "show_progress") { diff --git a/services/updater_binary/update_image_block.cpp b/services/updater_binary/update_image_block.cpp index 7d43e499..f454ffb6 100644 --- a/services/updater_binary/update_image_block.cpp +++ b/services/updater_binary/update_image_block.cpp @@ -28,7 +28,7 @@ #include "log/dump.h" #include "log/log.h" #include "updater/updater_const.h" -#include "updater/hwfault_retry.h" +#include "updater/hardware_fault_retry.h" #include "utils.h" #include "slot_info/slot_info.h" diff --git a/services/updater_binary/update_image_patch.cpp b/services/updater_binary/update_image_patch.cpp index 8e74f466..acee8550 100644 --- a/services/updater_binary/update_image_patch.cpp +++ b/services/updater_binary/update_image_patch.cpp @@ -33,7 +33,7 @@ #include "log/log.h" #include "patch/update_patch.h" #include "updater/updater_const.h" -#include "updater/hwfault_retry.h" +#include "updater/hardware_fault_retry.h" #include "utils.h" #include "slot_info/slot_info.h" diff --git a/services/updater_main.cpp b/services/updater_main.cpp index 5ce2aae5..0227a81e 100644 --- a/services/updater_main.cpp +++ b/services/updater_main.cpp @@ -45,7 +45,7 @@ #include "scope_guard.h" #include "securec.h" #include "updater/updater_const.h" -#include "updater/hwfault_retry.h" +#include "updater/hardware_fault_retry.h" #include "updater/updater_preprocess.h" #include "updater_ui_stub.h" #include "utils.h" @@ -501,7 +501,7 @@ UpdaterStatus InstallUpdaterBinfile(UpdaterParams &upParams, PkgManager::PkgMana UPDATER_UI_INSTANCE.ShowLog(TR(LOG_UPDFAIL)); STAGE(UPDATE_STAGE_FAIL) << "Install failed"; if (status == UPDATE_RETRY) { - HwFaultRetry::GetInstance().DoRetryAction(); + HardwareFaultRetry::GetInstance().DoRetryAction(); UPDATER_UI_INSTANCE.ShowFailedPage(); } } else { @@ -535,7 +535,7 @@ UpdaterStatus InstallUpdaterPackage(UpdaterParams &upParams, PkgManager::PkgMana UPDATER_UI_INSTANCE.ShowLog(TR(LOG_UPDFAIL)); STAGE(UPDATE_STAGE_FAIL) << "Install failed"; if (status == UPDATE_RETRY) { - HwFaultRetry::GetInstance().DoRetryAction(); + HardwareFaultRetry::GetInstance().DoRetryAction(); UPDATER_UI_INSTANCE.ShowFailedPage(); } } else { @@ -1216,7 +1216,7 @@ std::unordered_map> InitOptionsFuncTab(char* {"retry_count", [&]() -> void { upParams.retryCount = atoi(optarg); - HwFaultRetry::GetInstance().SetRetryCount(upParams.retryCount); + HardwareFaultRetry::GetInstance().SetRetryCount(upParams.retryCount); }}, {"panic_count", [&]() -> void { diff --git a/services/updater_utils.cpp b/services/updater_utils.cpp index ec17c43d..223628ec 100755 --- a/services/updater_utils.cpp +++ b/services/updater_utils.cpp @@ -31,7 +31,7 @@ #include "misc_info/misc_info.h" #include "package/pkg_manager.h" #include "securec.h" -#include "updater/hwfault_retry.h" +#include "updater/hardware_fault_retry.h" #include "updater/updater.h" #include "updater/updater_const.h" #include "updater_main.h" @@ -228,7 +228,7 @@ void PostUpdater(bool clearMisc) if (!access(COMMAND_FILE, 0) && unlink(COMMAND_FILE) != 0) { LOG(ERROR) << "Delete command failed"; } - if (!HwFaultRetry::GetInstance().IsRetry()) { + if (!HardwareFaultRetry::GetInstance().IsRetry()) { DeleteUpdaterTmpFiles(); } if (isMountDataAndSaveLogs) { diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index e44e8019..222fe2e7 100755 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -57,7 +57,7 @@ ohos_unittest("updater_unittest") { "diffpatch/image_patch_unittest.cpp", "log_test/log_unittest.cpp", "misc_info_test/misc_info_unittest.cpp", - "updater_test/hwfault_retry_unittest.cpp", + "updater_test/hardware_fault_retry_unittest.cpp", "updater_test/record_install_time_unittest.cpp", "updaterkits_test/updaterkits_unittest.cpp", ] @@ -78,7 +78,7 @@ ohos_unittest("updater_unittest") { "${updater_path}/services/diffpatch/patch/blocks_patch.cpp", "${updater_path}/services/diffpatch/patch/image_patch.cpp", "${updater_path}/services/diffpatch/patch/update_patch.cpp", - "${updater_path}/services/hwfault_retry/hwfault_retry.cpp", + "${updater_path}/services/hardware_fault/hardware_fault_retry.cpp", "${updater_path}/services/log/log.cpp", "${updater_path}/services/package/pkg_algorithm/pkg_algo_deflate.cpp", "${updater_path}/services/package/pkg_algorithm/pkg_algo_digest.cpp", diff --git a/test/unittest/flashd_test/BUILD.gn b/test/unittest/flashd_test/BUILD.gn index 590bdba6..e49e983b 100644 --- a/test/unittest/flashd_test/BUILD.gn +++ b/test/unittest/flashd_test/BUILD.gn @@ -64,7 +64,7 @@ ohos_unittest("flashd_unittest") { "${updater_path}/services/flashd/partition.cpp", "${updater_path}/services/hdi/client/update_hdi_client.cpp", "${updater_path}/services/hdi/server/update_hdi_impl.cpp", - "${updater_path}/services/hwfault_retry/hwfault_retry.cpp", + "${updater_path}/services/hardware_fault/hardware_fault_retry.cpp", "${updater_path}/services/updater_utils.cpp", "flashd_unittest.cpp", ] diff --git a/test/unittest/service_test/BUILD.gn b/test/unittest/service_test/BUILD.gn index 66062278..f3fb2ab4 100644 --- a/test/unittest/service_test/BUILD.gn +++ b/test/unittest/service_test/BUILD.gn @@ -24,7 +24,7 @@ ohos_unittest("updater_service_unittest") { module_out_path = MODULE_OUTPUT_PATH sources = [ "${updater_path}/services/factory_reset/factory_reset.cpp", - "${updater_path}/services/hwfault_retry/hwfault_retry.cpp", + "${updater_path}/services/hardware_fault/hardware_fault_retry.cpp", "${updater_path}/services/sdcard_update/sdcard_update.cpp", "${updater_path}/services/updater.cpp", "${updater_path}/services/updater_main.cpp", diff --git a/test/unittest/updater_test/hwfault_retry_unittest.cpp b/test/unittest/updater_test/hardware_fault_retry_unittest.cpp similarity index 46% rename from test/unittest/updater_test/hwfault_retry_unittest.cpp rename to test/unittest/updater_test/hardware_fault_retry_unittest.cpp index 526a3ea3..a29368a1 100644 --- a/test/unittest/updater_test/hwfault_retry_unittest.cpp +++ b/test/unittest/updater_test/hardware_fault_retry_unittest.cpp @@ -19,7 +19,7 @@ #include #include "log/log.h" #include "securec.h" -#include "updater/hwfault_retry.h" +#include "updater/hardware_fault_retry.h" #include "updater/updater.h" #include "updater/updater_const.h" #include "utils.h" @@ -29,13 +29,13 @@ using namespace std; using namespace testing::ext; namespace { -class HwfaultRetryUnitTest : public testing::Test { +class HardwareFaultRetryUnitTest : public testing::Test { public: - HwfaultRetryUnitTest() + HardwareFaultRetryUnitTest() { InitUpdaterLogger("UPDATER", TMP_LOG, TMP_STAGE_LOG, TMP_ERROR_CODE_PATH); } - ~HwfaultRetryUnitTest() {} + ~HardwareFaultRetryUnitTest() {} static void SetUpTestCase(void) {} static void TearDownTestCase(void) {} @@ -47,62 +47,62 @@ public: void TestBody() {} }; -HWTEST_F(HwfaultRetryUnitTest, VerifyFailRetry, TestSize.Level1) +HWTEST_F(HardwareFaultRetryUnitTest, VerifyFailRetry, TestSize.Level1) { - HwFaultRetry::GetInstance().SetFaultInfo(VERIFY_FAILED_REBOOT); - HwFaultRetry::GetInstance().SetRetryCount(0); - HwFaultRetry::GetInstance().DoRetryAction(); + HardwareFaultRetry::GetInstance().SetFaultInfo(VERIFY_FAILED_REBOOT); + HardwareFaultRetry::GetInstance().SetRetryCount(0); + HardwareFaultRetry::GetInstance().DoRetryAction(); bool ret = Utils::CheckFaultInfo(VERIFY_FAILED_REBOOT); EXPECT_EQ(ret, true); } -HWTEST_F(HwfaultRetryUnitTest, IOFailRetry, TestSize.Level1) +HWTEST_F(HardwareFaultRetryUnitTest, IOFailRetry, TestSize.Level1) { - HwFaultRetry::GetInstance().SetFaultInfo(IO_FAILED_REBOOT); - HwFaultRetry::GetInstance().SetRetryCount(0); - HwFaultRetry::GetInstance().DoRetryAction(); + HardwareFaultRetry::GetInstance().SetFaultInfo(IO_FAILED_REBOOT); + HardwareFaultRetry::GetInstance().SetRetryCount(0); + HardwareFaultRetry::GetInstance().DoRetryAction(); bool ret = Utils::CheckFaultInfo(IO_FAILED_REBOOT); EXPECT_EQ(ret, true); } -HWTEST_F(HwfaultRetryUnitTest, RetryMoreThanMax, TestSize.Level1) +HWTEST_F(HardwareFaultRetryUnitTest, RetryMoreThanMax, TestSize.Level1) { - HwFaultRetry::GetInstance().SetFaultInfo(IO_FAILED_REBOOT); - HwFaultRetry::GetInstance().SetRetryCount(MAX_RETRY_COUNT); - HwFaultRetry::GetInstance().DoRetryAction(); + HardwareFaultRetry::GetInstance().SetFaultInfo(IO_FAILED_REBOOT); + HardwareFaultRetry::GetInstance().SetRetryCount(MAX_RETRY_COUNT); + HardwareFaultRetry::GetInstance().DoRetryAction(); bool ret = Utils::CheckFaultInfo(IO_FAILED_REBOOT); EXPECT_EQ(ret, false); } -HWTEST_F(HwfaultRetryUnitTest, SetEffectiveValueTest, TestSize.Level1) +HWTEST_F(HardwareFaultRetryUnitTest, SetEffectiveValueTest, TestSize.Level1) { - HwFaultRetry::GetInstance().SetEffectiveValue(false); - HwFaultRetry::GetInstance().SetFaultInfo(VERIFY_FAILED_REBOOT); - HwFaultRetry::GetInstance().SetRetryCount(0); - HwFaultRetry::GetInstance().DoRetryAction(); + HardwareFaultRetry::GetInstance().SetEffectiveValue(false); + HardwareFaultRetry::GetInstance().SetFaultInfo(VERIFY_FAILED_REBOOT); + HardwareFaultRetry::GetInstance().SetRetryCount(0); + HardwareFaultRetry::GetInstance().DoRetryAction(); EXPECT_FALSE(Utils::CheckFaultInfo(VERIFY_FAILED_REBOOT)); } -HWTEST_F(HwfaultRetryUnitTest, RegisterAndRemoveTest, TestSize.Level1) +HWTEST_F(HardwareFaultRetryUnitTest, RegisterAndRemoveTest, TestSize.Level1) { - HwFaultRetry::GetInstance().SetEffectiveValue(true); - HwFaultRetry::GetInstance().RegisterDefaultFunc(PROCESS_BIN_FAIL_RETRY); - HwFaultRetry::GetInstance().SetFaultInfo(PROCESS_BIN_FAIL_RETRY); - HwFaultRetry::GetInstance().SetRetryCount(0); - HwFaultRetry::GetInstance().DoRetryAction(); - EXPECT_EQ(HwFaultRetry::GetInstance().IsRetry(), true); + HardwareFaultRetry::GetInstance().SetEffectiveValue(true); + HardwareFaultRetry::GetInstance().RegisterDefaultFunc(PROCESS_BIN_FAIL_RETRY); + HardwareFaultRetry::GetInstance().SetFaultInfo(PROCESS_BIN_FAIL_RETRY); + HardwareFaultRetry::GetInstance().SetRetryCount(0); + HardwareFaultRetry::GetInstance().DoRetryAction(); + EXPECT_EQ(HardwareFaultRetry::GetInstance().IsRetry(), true); EXPECT_EQ(Utils::CheckFaultInfo(PROCESS_BIN_FAIL_RETRY), true); (void)ClearMisc(); - HwFaultRetry::GetInstance().RemoveFunc(PROCESS_BIN_FAIL_RETRY); - HwFaultRetry::GetInstance().SetFaultInfo(PROCESS_BIN_FAIL_RETRY); - HwFaultRetry::GetInstance().SetRetryCount(0); - HwFaultRetry::GetInstance().DoRetryAction(); + HardwareFaultRetry::GetInstance().RemoveFunc(PROCESS_BIN_FAIL_RETRY); + HardwareFaultRetry::GetInstance().SetFaultInfo(PROCESS_BIN_FAIL_RETRY); + HardwareFaultRetry::GetInstance().SetRetryCount(0); + HardwareFaultRetry::GetInstance().DoRetryAction(); EXPECT_EQ(Utils::CheckFaultInfo(PROCESS_BIN_FAIL_RETRY), false); } -- Gitee From 17839e2dc70fdd1ad6969fc7d106e39c049ae0e7 Mon Sep 17 00:00:00 2001 From: curried Date: Wed, 6 Aug 2025 11:43:11 +0800 Subject: [PATCH 2/2] protected HardwareFaultRetry constructor Signed-off-by: curried --- services/include/updater/hardware_fault_retry.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/include/updater/hardware_fault_retry.h b/services/include/updater/hardware_fault_retry.h index f272e5ba..7b826e74 100644 --- a/services/include/updater/hardware_fault_retry.h +++ b/services/include/updater/hardware_fault_retry.h @@ -24,7 +24,6 @@ namespace Updater { class HardwareFaultRetry { public: - HardwareFaultRetry(); ~HardwareFaultRetry() = default; static HardwareFaultRetry &GetInstance(); @@ -48,6 +47,9 @@ private: uint32_t retryCount_ {}; bool effective_ = true; bool isRetry_ = false; + +private: + HardwareFaultRetry(); }; } // Updater #endif // UPDATER_HARDWARE_FAULT_RETRY_H -- Gitee