openharmony/hiviewdfx_hitrace
1
0
Fork 0
mirror of https://gitee.com/openharmony/hiviewdfx_hitrace synced 2024-11-23 15:59:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hitrace_cmd close trace_service

Browse Source 
Signed-off-by: jiangyuan0000 <jiangyuan29@huawei.com>
This commit is contained in:
jiangyuan0000 2023-09-08 16:57:31 +08:00
parent be365fd240
commit ee9df3e9f6
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/BUILD.gn
View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//base/hiviewdfx/hitrace/hitrace.gni")
import("//build/ohos.gni")
config("hitrace_osal_inner_config") {
@ -18,6 +19,7 @@ config("hitrace_osal_inner_config") {
include_dirs = [
"./include",
"../interfaces/native/innerkits/include/hitrace_meter",
"${OHOS_HITRACE_DIR}/interfaces/native/innerkits/include/",
]
}
@ -36,6 +38,7 @@ ohos_executable("hitrace") {
deps = [
":hitrace_osal_inner",
"${OHOS_HITRACE_DIR}/interfaces/native/innerkits:hitrace_dump",
"//third_party/zlib:libz",
]
@ -55,6 +58,7 @@ ohos_executable("bytrace") {
deps = [
":hitrace_osal_inner",
"${OHOS_HITRACE_DIR}/interfaces/native/innerkits:hitrace_dump",
"//third_party/zlib:libz",
]

16
cmd/src/hitrace_cmd.cpp
View File

@ -34,6 +34,7 @@
#include <zlib.h>
#include "hitrace_meter.h"
#include "hitrace_dump.h"
#include "hitrace_osal.h"
#include "securec.h"
@ -89,6 +90,8 @@ const unsigned int START_ASYNC = 2;
unsigned int g_traceStart = START_NORMAL;
bool g_traceStop = true;
bool g_traceDump = true;
bool g_defaultMode = false;
bool g_closeService = false;
map<string, TagCategory> g_tagMap;
vector<uint64_t> g_userEnabledTags;
@ -339,6 +342,9 @@ static bool SetUserSpaceSettings()
static bool ClearUserSpaceSettings()
{
if (g_closeService) {
return SetTraceTagsEnabled(HITRACE_TAG_ALWAYS) && RefreshServices();
}
return SetTraceTagsEnabled(0) && RefreshServices();
}
@ -466,10 +472,12 @@ static bool ParseLongOpt(const string& cmd, int optionIndex)
g_traceStart = START_NONE;
g_traceStop = true;
g_traceDump = true;
g_closeService = true;
} else if (!strcmp(LONG_OPTIONS[optionIndex].name, "trace_finish_nodump")) {
g_traceStart = START_NONE;
g_traceStop = true;
g_traceDump = false;
g_closeService = true;
} else if (!strcmp(LONG_OPTIONS[optionIndex].name, "trace_dump")) {
g_traceStart = START_NONE;
g_traceStop = false;
@ -561,6 +569,10 @@ static bool HandleOpt(int argc, char** argv)
}
isTrue = ParseOpt(opt, argv, optionIndex);
}
if (g_userEnabledTags.size() == 0 && g_kernelEnabledPaths.size() == 0) {
g_defaultMode = true;
}
return isTrue;
}
@ -988,6 +1000,10 @@ int main(int argc, char **argv)
exit(-1);
}
if (g_traceStart == START_ASYNC) {
if (g_defaultMode) {
const std::vector<std::string> tagGroups = {"scene_performance"};
OHOS::HiviewDFX::Hitrace::OpenTrace(tagGroups);
}
return isTrue ? 0 : -1;
}
WaitForTraceDone();