!23 【轻量级 PR】:change the FinishTrace

Merge pull request !23 from chuxuezhe11/N/A
This commit is contained in:
openharmony_ci
2021-11-26 02:07:14 +00:00
committed by Gitee
4 changed files with 17 additions and 17 deletions
+3 -3
View File
@@ -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;
+2 -2
View File
@@ -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, "", "");
@@ -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<string> 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<string> 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<string> 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<string> 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<string> 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<string> 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);
}
/**
@@ -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.
*/