From 8a9b82fea2d2015ce10a14e0a5e5b321d898fc6b Mon Sep 17 00:00:00 2001 From: chuxuezhe11 Date: Wed, 24 Nov 2021 11:53:59 +0000 Subject: [PATCH] change the FinishTrace Signed-off-by:chuxuezhe111 --- bin/example/bytrace_example.cpp | 6 +++--- bin/src/bytrace_impl.cpp | 4 ++-- .../common/native/bytrace_ndk_test.cpp | 20 +++++++++---------- interfaces/innerkits/native/include/bytrace.h | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/example/bytrace_example.cpp b/bin/example/bytrace_example.cpp index df4f421..1e8f6a1 100644 --- a/bin/example/bytrace_example.cpp +++ b/bin/example/bytrace_example.cpp @@ -57,7 +57,7 @@ int main() StartTrace(label, "func1Start", 1); // 打印起始点 func1(); - FinishTrace(label, ""); + FinishTrace(label); sleep(2); thread t2(threadFunc2); @@ -65,11 +65,11 @@ int main() StartTrace(label, "func2Start", 2); func2(); - FinishTrace(label, ""); + FinishTrace(label); sleep(2); sleep(1); - FinishTrace(label, ""); + FinishTrace(label); func3(); return 0; diff --git a/bin/src/bytrace_impl.cpp b/bin/src/bytrace_impl.cpp index 9822502..54ef55f 100755 --- a/bin/src/bytrace_impl.cpp +++ b/bin/src/bytrace_impl.cpp @@ -156,12 +156,12 @@ void StartTraceDebug(uint64_t label, const string& value, float limit) #endif } -void FinishTrace(uint64_t label, const string& value) +void FinishTrace(uint64_t label) { AddBytraceMarker(MARKER_END, label, "", ""); } -void FinishTraceDebug(uint64_t label, const string& value) +void FinishTraceDebug(uint64_t label) { #if (TRACE_LEVEL >= DEBUG_LEVEL) AddBytraceMarker(MARKER_END, label, "", ""); diff --git a/bin/test/unittest/common/native/bytrace_ndk_test.cpp b/bin/test/unittest/common/native/bytrace_ndk_test.cpp index e830d8a..95189b9 100755 --- a/bin/test/unittest/common/native/bytrace_ndk_test.cpp +++ b/bin/test/unittest/common/native/bytrace_ndk_test.cpp @@ -405,7 +405,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_001, TestSize.Level0) ASSERT_TRUE(CleanTrace()); ASSERT_TRUE(SetFtrace(TRACING_ON, true)) << "Setting tracing_on failed."; StartTrace(TAG, "StartTraceTest001"); - FinishTrace(TAG, "StartTraceTest001"); + FinishTrace(TAG); ASSERT_TRUE(SetFtrace(TRACING_ON, false)) << "Setting tracing_on failed."; vector list = ReadTrace(); MyTrace startTrace = GetTraceResult(TRACE_START + "(StartTraceTest001) ", list); @@ -424,7 +424,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_002, TestSize.Level0) ASSERT_TRUE(CleanTrace()); ASSERT_TRUE(SetFtrace(TRACING_ON, true)) << "Setting tracing_on failed."; StartTrace(TAG, "StartTraceTest002"); - FinishTrace(TAG, "StartTraceTest002"); + FinishTrace(TAG); ASSERT_TRUE(SetFtrace(TRACING_ON, false)) << "Setting tracing_on failed."; vector list = ReadTrace(); MyTrace startTrace = GetTraceResult(TRACE_START + "(StartTraceTest002) ", list); @@ -443,7 +443,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_003, TestSize.Level0) ASSERT_TRUE(CleanTrace()); ASSERT_TRUE(SetFtrace(TRACING_ON, true)) << "Setting tracing_on failed."; StartTrace(TAG, "StartTraceTest003 %s"); - FinishTrace(TAG, "StartTraceTest003 %s"); + FinishTrace(TAG); vector list = ReadTrace(); MyTrace startTrace = GetTraceResult(TRACE_START + "(StartTraceTest003 %s) ", list); ASSERT_TRUE(startTrace.IsLoaded()) << "Can't find \"B|pid|StartTraceTest003 %s\" from trace."; @@ -452,7 +452,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_003, TestSize.Level0) ASSERT_TRUE(CleanTrace()); list.clear(); StartTrace(TAG, "StartTraceTest003 %p"); - FinishTrace(TAG, "StartTraceTest003 %p"); + FinishTrace(TAG); ASSERT_TRUE(SetFtrace(TRACING_ON, false)) << "Setting tracing_on failed."; list = ReadTrace(); MyTrace startTrace2 = GetTraceResult(TRACE_START + "(StartTraceTest003 %p) ", list); @@ -471,7 +471,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_004, TestSize.Level0) ASSERT_TRUE(SetFtrace(TRACING_ON, true)) << "Setting tracing_on failed."; StartTrace(TAG, "StartTraceTest004"); usleep(1000); - FinishTrace(TAG, "StartTraceTest004"); + FinishTrace(TAG); ASSERT_TRUE(SetFtrace(TRACING_ON, false)) << "Setting tracing_on failed."; vector list = ReadTrace(); MyTrace startTrace = GetTraceResult(TRACE_START + "(StartTraceTest004) ", list); @@ -526,7 +526,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_007, TestSize.Level1) ASSERT_TRUE(CleanTrace()); ASSERT_TRUE(SetFtrace(TRACING_ON, true)) << "Setting tracing_on failed."; StartTrace(TRACE_INVALIDATE_TAG, "StartTraceTest007"); - FinishTrace(TRACE_INVALIDATE_TAG, "StartTraceTest007"); + FinishTrace(TRACE_INVALIDATE_TAG); ASSERT_TRUE(SetFtrace(TRACING_ON, false)) << "Setting tracing_on failed."; vector list = ReadTrace(); MyTrace startTrace = GetTraceResult(TRACE_START + "(StartTraceTest007)", list); @@ -545,7 +545,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_008, TestSize.Level1) ASSERT_TRUE(CleanTrace()); ASSERT_TRUE(SetFtrace(TRACING_ON, true)) << "Setting tracing_on failed."; StartTrace(TRACE_INVALIDATE_TAG, "StartTraceTest008 %s"); - FinishTrace(TRACE_INVALIDATE_TAG, "StartTraceTest008 %s"); + FinishTrace(TRACE_INVALIDATE_TAG); vector list = ReadTrace(); MyTrace startTrace = GetTraceResult(TRACE_START + "(StartTraceTest008 %s)", list); EXPECT_FALSE(startTrace.IsLoaded()) << "Can't find \"B|pid|StartTraceTest008 %s\" from trace."; @@ -554,7 +554,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_008, TestSize.Level1) ASSERT_TRUE(CleanTrace()); list.clear(); StartTrace(TRACE_INVALIDATE_TAG, "StartTraceTest008 %p"); - FinishTrace(TRACE_INVALIDATE_TAG, "StartTraceTest008 %p"); + FinishTrace(TRACE_INVALIDATE_TAG); ASSERT_TRUE(SetFtrace(TRACING_ON, false)) << "Setting tracing_on failed."; list = ReadTrace(); MyTrace startTrace2 = GetTraceResult(TRACE_START + "(StartTraceTest008 %p)", list); @@ -608,7 +608,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_011, TestSize.Level1) ASSERT_TRUE(CleanTrace()); ASSERT_TRUE(SetFtrace(TRACING_ON, true)) << "Setting tracing_on failed."; StartTraceDebug(TAG, "StartTraceTest011"); - FinishTraceDebug(TAG, "StartTraceTest011"); + FinishTraceDebug(TAG); } /** @@ -621,7 +621,7 @@ HWTEST_F(BytraceNDKTest, StartTrace_012, TestSize.Level1) ASSERT_TRUE(CleanTrace()); ASSERT_TRUE(SetFtrace(TRACING_ON, true)) << "Setting tracing_on failed."; StartTraceDebug(TAG, "StartTraceTest012 %s"); - FinishTraceDebug(TAG, "StartTraceTest012 %s"); + FinishTraceDebug(TAG); } /** diff --git a/interfaces/innerkits/native/include/bytrace.h b/interfaces/innerkits/native/include/bytrace.h index 48c805a..b751052 100755 --- a/interfaces/innerkits/native/include/bytrace.h +++ b/interfaces/innerkits/native/include/bytrace.h @@ -70,8 +70,8 @@ void StartTraceDebug(uint64_t label, const std::string& value, float limit = -1) /** * Track the end of a context. */ -void FinishTrace(uint64_t label, const std::string& value); -void FinishTraceDebug(uint64_t label, const std::string& value); +void FinishTrace(uint64_t label); +void FinishTraceDebug(uint64_t label); /** * Track the beginning of an asynchronous event. */