openharmony/systemabilitymgr_safwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/systemabilitymgr_safwk synced 2024-10-06 21:43:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!507 dependsa流程增加xcollie监控

Browse Source 
Merge pull request !507 from chenbingbing/master
This commit is contained in:
openharmony_ci 2024-09-27 07:29:16 +00:00 committed by Gitee
commit 026f1f51a2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
services/safwk/src/local_ability_manager.cpp
View File

@ -36,6 +36,7 @@
#include "timer.h"
#include "hisysevent_adapter.h"
#include "system_ability_definition.h"
#include "samgr_xcollie.h"
namespace OHOS {
using std::u16string;
@ -54,6 +55,7 @@ constexpr int32_t RESIDENT_SA_UNUSED_TIMEOUT = 1000 * 60 * 10;
constexpr std::chrono::milliseconds MILLISECONDS_WAITING_SAMGR_ONE_TIME(200);
constexpr std::chrono::milliseconds MILLISECONDS_WAITING_ONDEMAND_ONE_TIME(100);
constexpr int32_t TIME_S_TO_MS = 1000;
constexpr int32_t MAX_DEPEND_TIMEOUT = 65;
constexpr int32_t MAX_SA_STARTUP_TIME = 100;
constexpr int32_t SUFFIX_LENGTH = 5; // .json length
@ -609,20 +611,23 @@ void LocalAbilityManager::StartDependSaTask(SystemAbility* ability)
size_t lastSize = CheckDependencyStatus(ability->GetDependSa()).size();
HILOGI(TAG, "SA:%{public}d's depend timeout:%{public}" PRId64 " ms,depend size:%{public}zu",
ability->GetSystemAbilitId(), dependTimeout, lastSize);
while (lastSize > 0) {
int64_t end = GetTickCount();
int64_t duration = ((end >= start) ? (end - start) : (INT64_MAX - end + start));
if (duration < dependTimeout) {
usleep(CHECK_DEPENDENT_SA_PERIOD);
} else {
break;
{
SamgrXCollie samgrXCollie("DependSaTimeout_" + ToString(ability->GetSystemAbilitId()), MAX_DEPEND_TIMEOUT);
while (lastSize > 0) {
int64_t end = GetTickCount();
int64_t duration = ((end >= start) ? (end - start) : (INT64_MAX - end + start));
if (duration < dependTimeout) {
usleep(CHECK_DEPENDENT_SA_PERIOD);
} else {
break;
}
vector<int32_t> temp = CheckDependencyStatus(ability->GetDependSa());
size_t curSize = temp.size();
if (curSize != lastSize) {
HILOGI(TAG, "SA:%{public}d's depend left:%{public}zu", ability->GetSystemAbilitId(), curSize);
}
lastSize = curSize;
}
vector<int32_t> temp = CheckDependencyStatus(ability->GetDependSa());
size_t curSize = temp.size();
if (curSize != lastSize) {
HILOGI(TAG, "SA:%{public}d's depend left:%{public}zu", ability->GetSystemAbilitId(), curSize);
}
lastSize = curSize;
}
vector<int32_t> unpreparedDeps = CheckDependencyStatus(ability->GetDependSa());
if (unpreparedDeps.empty()) {