diff options
| author | Tor Lillqvist <tml@collabora.com> | 2021-05-11 13:58:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2021-06-09 13:49:31 +0200 |
| commit | 6038c9125bcb9f6d5dc2b998f2bef476ba1b1f98 (patch) | |
| tree | be725a15fd8d484ee2f0c25702a9f638dafeaa01 /comphelper | |
| parent | e4f5705b91ecacdfc84e564e116dfe812fd96b61 (diff) | |
Add the possibility to include a set of arguments in Trace Events
Change-Id: I55720baf64bd9b719026c94e4373b6368a1a7106
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116847
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/qa/unit/test_traceevent.cxx | 15 | ||||
| -rw-r--r-- | comphelper/source/misc/traceevent.cxx | 9 |
2 files changed, 14 insertions, 10 deletions
diff --git a/comphelper/qa/unit/test_traceevent.cxx b/comphelper/qa/unit/test_traceevent.cxx index 29094b14f01b..37855b82d5d4 100644 --- a/comphelper/qa/unit/test_traceevent.cxx +++ b/comphelper/qa/unit/test_traceevent.cxx @@ -74,7 +74,8 @@ void trace_event_test() CPPUNIT_ASSERT(pAsync2.expired()); // This will generate a 'b' event for async3 - auto pAsync3(std::make_shared<comphelper::AsyncEvent>("async3")); + std::map<OUString, OUString> aArgsAsync3({ { "foo", "bar" }, { "tem", "42" } }); + auto pAsync3(std::make_shared<comphelper::AsyncEvent>("async3", aArgsAsync3)); std::weak_ptr<comphelper::AsyncEvent> pAsync4; @@ -92,7 +93,8 @@ void trace_event_test() comphelper::ProfileZone aZone4("test2"); // This will generate an 'i' event for instant2" - comphelper::TraceEvent::addInstantEvent("instant2"); + std::map<OUString, OUString> aArgsInstant2({ { "foo2", "bar2" }, { "tem2", "42" } }); + comphelper::TraceEvent::addInstantEvent("instant2", aArgsInstant2); std::weak_ptr<comphelper::AsyncEvent> pAsync5; { @@ -148,11 +150,13 @@ void TestTraceEvent::test() CPPUNIT_ASSERT(aEvents[0].startsWith("{\"name:\"instant1\",\"ph\":\"i\",")); CPPUNIT_ASSERT(aEvents[1].startsWith("{\"name\":\"async2.5\",\"ph\":\"b\",\"id\":1,")); CPPUNIT_ASSERT(aEvents[2].startsWith("{\"name\":\"block2\",\"ph\":\"X\",")); - CPPUNIT_ASSERT(aEvents[3].startsWith("{\"name\":\"async3\",\"ph\":\"b\",\"id\":2,")); + CPPUNIT_ASSERT(aEvents[3].startsWith( + "{\"name\":\"async3\",\"ph\":\"b\",\"id\":2,\"args\":{\"foo\",\"bar\",\"tem\",\"42\"},")); CPPUNIT_ASSERT(aEvents[4].startsWith("{\"name\":\"async4in3\",\"ph\":\"b\",\"id\":2,")); CPPUNIT_ASSERT(aEvents[5].startsWith("{\"name\":\"block3\",\"ph\":\"X\",")); CPPUNIT_ASSERT(aEvents[6].startsWith("{\"name\":\"async2.5\",\"ph\":\"e\",\"id\":1,")); - CPPUNIT_ASSERT(aEvents[7].startsWith("{\"name:\"instant2\",\"ph\":\"i\",")); + CPPUNIT_ASSERT(aEvents[7].startsWith( + "{\"name:\"instant2\",\"ph\":\"i\",\"args\":{\"foo2\",\"bar2\",\"tem2\",\"42\"},")); CPPUNIT_ASSERT(aEvents[8].startsWith("{\"name\":\"async5in4\",\"ph\":\"b\",\"id\":2,")); CPPUNIT_ASSERT(aEvents[9].startsWith("{\"name\":\"async6in5\",\"ph\":\"b\",\"id\":2,")); CPPUNIT_ASSERT(aEvents[10].startsWith("{\"name\":\"async6in5\",\"ph\":\"e\",\"id\":2,")); @@ -161,7 +165,8 @@ void TestTraceEvent::test() CPPUNIT_ASSERT(aEvents[13].startsWith("{\"name\":\"test2\",\"ph\":\"X\"")); CPPUNIT_ASSERT(aEvents[14].startsWith("{\"name\":\"async4in3\",\"ph\":\"e\",\"id\":2,")); CPPUNIT_ASSERT(aEvents[15].startsWith("{\"name\":\"async7in3\",\"ph\":\"e\",\"id\":2,")); - CPPUNIT_ASSERT(aEvents[16].startsWith("{\"name\":\"async3\",\"ph\":\"e\",\"id\":2,")); + CPPUNIT_ASSERT(aEvents[16].startsWith( + "{\"name\":\"async3\",\"ph\":\"e\",\"id\":2,\"args\":{\"foo\",\"bar\",\"tem\",\"42\"},")); } CPPUNIT_TEST_SUITE_REGISTRATION(TestTraceEvent); diff --git a/comphelper/source/misc/traceevent.cxx b/comphelper/source/misc/traceevent.cxx index 3a2e1b012c4c..cd6d3929e27c 100644 --- a/comphelper/source/misc/traceevent.cxx +++ b/comphelper/source/misc/traceevent.cxx @@ -40,7 +40,7 @@ void TraceEvent::addRecording(const OUString& sObject) g_aRecording.emplace_back(sObject); } -void TraceEvent::addInstantEvent(const char* sName) +void TraceEvent::addInstantEvent(const char* sName, const std::map<OUString, OUString>& args) { long long nNow = getNow(); @@ -54,9 +54,8 @@ void TraceEvent::addInstantEvent(const char* sName) "\"name:\"" + OUString(sName, strlen(sName), RTL_TEXTENCODING_UTF8) + "\"," - "\"ph\":\"i\"," - "\"ts\":" - + OUString::number(nNow) + "\"ph\":\"i\"" + + createArgsString(args) + ",\"ts\":" + OUString::number(nNow) + "," "\"pid\":" + OUString::number(nPid) @@ -110,7 +109,7 @@ void ProfileZone::addRecording() + OUString::number(m_nCreateTime) + "," "\"dur\":" - + OUString::number(nNow - m_nCreateTime) + + OUString::number(nNow - m_nCreateTime) + m_sArgs + "," "\"pid\":" + OUString::number(m_nPid) |