diff options
| author | Gopi Krishna Menon <gopi.menon@collabora.com> | 2021-07-29 15:21:13 +0530 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2021-10-26 10:24:14 +0200 |
| commit | 2623b86bcdf90f8fbf1fbf32c4a8e78380625a19 (patch) | |
| tree | 2a860f348b0dacf782ebacffc99a4104ffb4e94c /comphelper | |
| parent | tdf#138531: Also update DDE tables, not only fields (diff) | |
| download | core-2623b86bcdf90f8fbf1fbf32c4a8e78380625a19.tar.gz core-2623b86bcdf90f8fbf1fbf32c4a8e78380625a19.zip | |
Fix Nesting Level Bug in ProfileZone
Moves the profile zone global nesting variable into the source from header and makes it threadlocal
Change-Id: I97751f5c532d8e0e36adb7d9d383bd88f752953f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119662
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit 74f4a1796f94477d459c71d0a0aaa8f4a430e208)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119618
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/traceevent.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/comphelper/source/misc/traceevent.cxx b/comphelper/source/misc/traceevent.cxx index 4fc4410615b4..4216de109ca2 100644 --- a/comphelper/source/misc/traceevent.cxx +++ b/comphelper/source/misc/traceevent.cxx @@ -29,7 +29,8 @@ std::size_t TraceEvent::s_nBufferSize = 0; void (*TraceEvent::s_pBufferFullCallback)() = nullptr; int AsyncEvent::s_nIdCounter = 0; -int ProfileZone::s_nNesting = 0; + +static thread_local int nProfileZoneNesting = 0; // Level of Nested Profile Zones namespace { @@ -141,6 +142,10 @@ void ProfileZone::stopConsole() << nEndTime - m_nCreateTime << " ms" << std::endl; } +int ProfileZone::getNestingLevel() { return nProfileZoneNesting; } + +void ProfileZone::setNestingLevel(int nNestingLevel) { nProfileZoneNesting = nNestingLevel; } + } // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |