From 613bdd59fa41e17e82d06d4fde4bdd175b00f988 Mon Sep 17 00:00:00 2001 From: xlei1030 Date: Wed, 2 Mar 2022 17:53:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20=E4=BF=AE=E6=94=B9wagner=20reset?= =?UTF-8?q?=E6=8C=89=E9=94=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xlei1030 --- src/appspawn_server.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 4f99f948..322a2d48 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -68,7 +68,7 @@ constexpr int32_t WAIT_DELAY_US = 100 * 1000; // 100ms constexpr int32_t GID_USER_DATA_RW = 1008; constexpr int32_t MAX_GIDS = 64; constexpr int32_t UID_BASE = 200000; -constexpr int32_t WAIT_PARAM_TIME = 1000; +constexpr int32_t WAIT_PARAM_TIME = 5; constexpr std::string_view BUNDLE_NAME_MEDIA_LIBRARY("com.ohos.medialibrary.MediaLibraryDataA"); constexpr std::string_view BUNDLE_NAME_SCANNER("com.ohos.medialibrary.MediaScannerAbilityA"); @@ -171,13 +171,23 @@ void AppSpawnServer::ConnectionPeer() void AppSpawnServer::WaitRebootEvent() { APPSPAWN_LOGI("wait 'startup.device.ctl' event"); + std::string getValue = ""; + int ret = -1; while (isRunning_) { - int ret = WaitParameter("startup.device.ctl", "stop", WAIT_PARAM_TIME); + ret = WaitParameter("startup.device.ctl", "stop", WAIT_PARAM_TIME); if (ret == 0) { std::lock_guard lock(mut_); isStop_ = true; dataCond_.notify_one(); break; + } else { + ret = OHOS::system::GetStringParameter("startup.device.ctl", getValue, ""); + if (ret == 0 && getValue == "stop") { + std::lock_guard lock(mut_); + isStop_ = true; + dataCond_.notify_one(); + break; + } } } } -- Gitee From 11d6ddaa6e48e65382853f7680d320fdd3f08297 Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Wed, 2 Mar 2022 19:42:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3reset=E6=97=B6?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- src/appspawn_server.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 322a2d48..743308cb 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -171,18 +171,16 @@ void AppSpawnServer::ConnectionPeer() void AppSpawnServer::WaitRebootEvent() { APPSPAWN_LOGI("wait 'startup.device.ctl' event"); - std::string getValue = ""; - int ret = -1; while (isRunning_) { - ret = WaitParameter("startup.device.ctl", "stop", WAIT_PARAM_TIME); + int ret = WaitParameter("startup.device.ctl", "stop", WAIT_PARAM_TIME); if (ret == 0) { std::lock_guard lock(mut_); isStop_ = true; dataCond_.notify_one(); break; } else { - ret = OHOS::system::GetStringParameter("startup.device.ctl", getValue, ""); - if (ret == 0 && getValue == "stop") { + std::string value = OHOS::system::GetParameter("startup.device.ctl", ""); + if (ret == 0 && value == "stop") { std::lock_guard lock(mut_); isStop_ = true; dataCond_.notify_one(); -- Gitee From 1c62285b150cebaf3da84181f369006aaec2b0e1 Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Wed, 2 Mar 2022 21:22:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3reset=E6=97=B6?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- src/appspawn_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 743308cb..df76ef36 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -180,7 +180,7 @@ void AppSpawnServer::WaitRebootEvent() break; } else { std::string value = OHOS::system::GetParameter("startup.device.ctl", ""); - if (ret == 0 && value == "stop") { + if (value == "stop") { std::lock_guard lock(mut_); isStop_ = true; dataCond_.notify_one(); -- Gitee