1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From e0aace24cbc8d0943bb79589d1a236fb8ff5afdb Mon Sep 17 00:00:00 2001
From: heppen <hepeng68@huawei.com>
Date: Tue, 20 Jun 2023 17:23:24 +0800
Subject: [PATCH] remove dependency on hitrace
---
interfaces/innerkits/safwk/BUILD.gn | 2 +-
services/safwk/src/local_ability_manager.cpp | 4 ++--
services/safwk/src/system_ability.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/interfaces/innerkits/safwk/BUILD.gn b/interfaces/innerkits/safwk/BUILD.gn
index 5509789..3dd18cb 100644
--- a/interfaces/innerkits/safwk/BUILD.gn
+++ b/interfaces/innerkits/safwk/BUILD.gn
@@ -51,7 +51,7 @@ ohos_shared_library("system_ability_fwk") {
if (is_standard_system) {
external_deps = [
"c_utils:utils",
- "hitrace_native:hitrace_meter",
+ # "hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",
"samgr:samgr_common",
diff --git a/services/safwk/src/local_ability_manager.cpp b/services/safwk/src/local_ability_manager.cpp
index 11f7a06..0af6af9 100644
--- a/services/safwk/src/local_ability_manager.cpp
+++ b/services/safwk/src/local_ability_manager.cpp
@@ -22,7 +22,7 @@
#include "datetime_ex.h"
#include "errors.h"
-#include "hitrace_meter.h"
+// #include "hitrace_meter.h"
#include "ipc_skeleton.h"
#include "iservice_registry.h"
#include "safwk_log.h"
@@ -88,7 +88,7 @@ void LocalAbilityManager::DoStartSAProcess(const std::string& profilePath, int32
}
{
std::string traceTag = GetTraceTag(realProfilePath);
- HITRACE_METER_NAME(HITRACE_TAG_SAMGR, traceTag);
+ // HITRACE_METER_NAME(HITRACE_TAG_SAMGR, traceTag);
bool ret = InitSystemAbilityProfiles(realProfilePath, saId);
if (!ret) {
HILOGE(TAG, "InitSystemAbilityProfiles no right profile, will exit");
diff --git a/services/safwk/src/system_ability.cpp b/services/safwk/src/system_ability.cpp
index 84911e0..e618560 100644
--- a/services/safwk/src/system_ability.cpp
+++ b/services/safwk/src/system_ability.cpp
@@ -19,7 +19,7 @@
#include "datetime_ex.h"
#include "errors.h"
-#include "hitrace_meter.h"
+// #include "hitrace_meter.h"
#include "if_system_ability_manager.h"
#include "iservice_registry.h"
#include "local_ability_manager.h"
@@ -114,7 +114,7 @@ void SystemAbility::Start()
}
HILOGD(TAG, "[PerformanceTest] SAFWK OnStart systemAbilityId:%{public}d", saId_);
int64_t begin = GetTickCount();
- HITRACE_METER_NAME(HITRACE_TAG_SAMGR, ToString(saId_) + "_OnStart");
+ // HITRACE_METER_NAME(HITRACE_TAG_SAMGR, ToString(saId_) + "_OnStart");
OnStart();
isRunning_ = true;
HILOGI(TAG, "[PerformanceTest] SAFWK OnStart systemAbilityId:%{public}d finished, spend:%{public}" PRId64 " ms",
--
2.33.0
|
