openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

!5798 watchdog检测后台extension应用超时

Browse Source 
Merge pull request !5798 from donglin/watchdog
This commit is contained in:
openharmony_ci
2023-06-26 11:29:03 +00:00
committed by Gitee
parent c778f9619d f351f622a3
commit e3af232be5
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/kits/native/appkit/app/watchdog.h
+1 -1
View File
@@ -99,7 +99,7 @@ private:
std::atomic_bool stopWatchdog_ = false;
std::atomic_bool needReport_ = true;
std::atomic_bool isSixSecondEvent_ = false;
std::atomic_bool isInBackground_ = false;
std::atomic_bool isInBackground_ = true;
std::shared_ptr<ApplicationInfo> applicationInfo_ = nullptr;
std::mutex cvMutex_;
std::condition_variable cvWatchdog_;
test/unittest/frameworks_kits_appkit_native_test/watchdog_test.cpp
+8 -4
View File
@@ -236,10 +236,10 @@ HWTEST_F(WatchdogTest, WatchdogTest_SetAppMainThreadState_001, TestSize.Level1)
HWTEST_F(WatchdogTest, WatchdogTest_SetBackgroundStatus_001, TestSize.Level1)
{
GTEST_LOG_(INFO) << "WatchdogTest_SetBackgroundStatus_001 start";
bool isInBackground = true;
EXPECT_FALSE(watchdog_->isInBackground_);
watchdog_->SetBackgroundStatus(isInBackground);
bool isInBackground = false;
EXPECT_TRUE(watchdog_->isInBackground_);
watchdog_->SetBackgroundStatus(isInBackground);
EXPECT_FALSE(watchdog_->isInBackground_);
GTEST_LOG_(INFO) << "WatchdogTest_SetBackgroundStatus_001 end";
}
@@ -323,7 +323,7 @@ HWTEST_F(WatchdogTest, WatchdogTest_Timer_002, TestSize.Level1)
{
GTEST_LOG_(INFO) << "WatchdogTest_Timer_002 start";
bool isInBackground = true;
EXPECT_FALSE(watchdog_->isInBackground_);
EXPECT_TRUE(watchdog_->isInBackground_);
watchdog_->SetBackgroundStatus(isInBackground);
watchdog_->Timer();
EXPECT_TRUE(watchdog_->appMainThreadIsAlive_);
@@ -341,6 +341,8 @@ HWTEST_F(WatchdogTest, WatchdogTest_Timer_003, TestSize.Level1)
bool appMainThreadState = true;
EXPECT_FALSE(watchdog_->appMainThreadIsAlive_);
watchdog_->SetAppMainThreadState(appMainThreadState);
bool isInBackground = false;
watchdog_->SetBackgroundStatus(isInBackground);
watchdog_->Timer();
EXPECT_TRUE(watchdog_->needReport_);
EXPECT_FALSE(watchdog_->isInBackground_);
@@ -359,6 +361,8 @@ HWTEST_F(WatchdogTest, WatchdogTest_Timer_004, TestSize.Level1)
bool appMainThreadState = true;
EXPECT_FALSE(watchdog_->appMainThreadIsAlive_);
watchdog_->SetAppMainThreadState(appMainThreadState);
bool isInBackground = false;
watchdog_->SetBackgroundStatus(isInBackground);
watchdog_->appMainHandler_ = std::make_shared<EventHandler>();
watchdog_->Timer();
EXPECT_TRUE(watchdog_->needReport_);