summaryrefslogtreecommitdiffstats
path: root/comphelper
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2021-04-27 13:32:19 +0300
committerTor Lillqvist <tml@collabora.com>2021-04-29 10:38:01 +0200
commitb9c12bcf9b442e43fbc535c30caab513d07b9067 (patch)
tree6cd1849ce531aef55da868b0d3f41dda2089e84f /comphelper
parentMake the console logging in ProfileZone work more sanely (diff)
downloadcore-b9c12bcf9b442e43fbc535c30caab513d07b9067.tar.gz
core-b9c12bcf9b442e43fbc535c30caab513d07b9067.zip
Re-think what the nesting means in ProfileZones
The "Complete" type of Trace Events should be properly nested. Use the nesting counter to verify that. Add a nesting level indication to the ProfileZone object. Assert that it is used properly. Change-Id: I3a1f0e55ea6054dab9baf8550097446f07b0fbf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114795 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/source/misc/traceevent.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/comphelper/source/misc/traceevent.cxx b/comphelper/source/misc/traceevent.cxx
index 325ba59b131d..2cd2db829169 100644
--- a/comphelper/source/misc/traceevent.cxx
+++ b/comphelper/source/misc/traceevent.cxx
@@ -24,7 +24,7 @@ namespace comphelper
{
std::atomic<bool> TraceEvent::s_bRecording = false;
-int TraceEvent::s_nNesting = 0; // level of overlapped zones
+int ProfileZone::s_nNesting = 0;
namespace
{
@@ -70,7 +70,6 @@ void TraceEvent::addInstantEvent(const char* sProfileId)
void TraceEvent::startRecording()
{
::osl::MutexGuard aGuard(g_aMutex);
- s_nNesting = 0;
s_bRecording = true;
}