diff options
author | Tor Lillqvist <tml@collabora.com> | 2021-04-15 14:31:40 +0300 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2021-04-15 14:42:47 +0200 |
commit | 9f90a2bc6223da8be7b9c3f982482dec081681f8 (patch) | |
tree | 71667d4be4eeaa4dc099d3d940b2da2745a6f013 /include | |
parent | dd57e1e9de21f05ff2c9c477c1a17ac25cd5bdfe (diff) |
Refactor ProfileZone and create Chrome Trace Event Format data
Instead of separate B ("begin") and E ("end") duration events,
generate X ("complete") events.
Only the event JSON objects are generated, not the surrounding array
or object.
See
https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview#heading=h.lc5airzennvk
Online now needs work so that the events are written out to a separate
file instead of being in the common log file.
Change-Id: Ie9363b4cfda862a70e1928ed16350e50a6fee9a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114142
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/profilezone.hxx | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/include/comphelper/profilezone.hxx b/include/comphelper/profilezone.hxx index b54d69523fd6..3f758d88d987 100644 --- a/include/comphelper/profilezone.hxx +++ b/include/comphelper/profilezone.hxx @@ -14,6 +14,8 @@ #include <atomic> +#include <osl/process.h> +#include <osl/time.h> #include <com/sun/star/uno/Sequence.h> #include <comphelper/comphelperdllapi.h> #include <rtl/ustring.hxx> @@ -23,39 +25,54 @@ namespace comphelper { -namespace ProfileRecording -{ - -COMPHELPER_DLLPUBLIC void startRecording(); -COMPHELPER_DLLPUBLIC void stopRecording(); - -COMPHELPER_DLLPUBLIC long long addRecording(const char * aProfileId, long long aCreateTime); - -COMPHELPER_DLLPUBLIC css::uno::Sequence<OUString> getRecordingAndClear(); - -} // namespace ProfileRecording - class COMPHELPER_DLLPUBLIC ProfileZone { private: - const char * m_sProfileId; - long long const m_aCreateTime; -public: - static std::atomic<bool> g_bRecording; // true during recording + static std::atomic<bool> s_bRecording; // true during recording + static int s_nNesting; + const char *m_sProfileId; + long long m_nCreateTime; + int m_nPid; + + void addRecording(); + + public: // Note that the char pointer is stored as such in the ProfileZone object and used in the // destructor, so be sure to pass a pointer that stays valid for the duration of the object's // lifetime. ProfileZone(const char *sProfileId) - : m_sProfileId(sProfileId), - m_aCreateTime(g_bRecording ? ProfileRecording::addRecording(sProfileId, 0) : 0) + : m_sProfileId(sProfileId ? sProfileId : "(null)") { + if (s_bRecording) + { + TimeValue systemTime; + osl_getSystemTime( &systemTime ); + m_nCreateTime = static_cast<long long>(systemTime.Seconds) * 1000000 + systemTime.Nanosec/1000; + + oslProcessInfo aProcessInfo; + aProcessInfo.Size = sizeof(oslProcessInfo); + if (osl_getProcessInfo(nullptr, osl_Process_IDENTIFIER, &aProcessInfo) == osl_Process_E_None) + m_nPid = aProcessInfo.Ident; + + s_nNesting++; + } + else + m_nCreateTime = 0; } ~ProfileZone() { - if (g_bRecording) - ProfileRecording::addRecording(m_sProfileId, m_aCreateTime); + if (s_bRecording) + { + s_nNesting--; + addRecording(); + } } + + static void startRecording(); + static void stopRecording(); + + static css::uno::Sequence<OUString> getRecordingAndClear(); }; } // namespace comphelper |