[Libreoffice-commits] core.git: desktop/source

[Tor Lillqvist (via logerrit)]

 desktop/source/lib/init.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit e9dc82b761a71369c4c49ae6d5fd8892f999c77a
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jun 29 15:04:58 2021 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jun 30 09:19:58 2021 +0200

    Avoid accumulating a huge number of Trace Events before calling the callback
    
    Don't use only the five second timer to flush the buffer. Set a limit
    on the number of accumulated events, too.
    
    Change-Id: I075028ce653d89cf099d91ce0d4d97c1361a3bb4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118089
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 25206944d90d..7d3fc9f078ab 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -210,7 +210,13 @@ public:
         SetTimeout(dumpTimeoutMS);
         Start();
     }
+
     virtual void Invoke() override
+    {
+        flushRecordings();
+    }
+
+    static void flushRecordings()
     {
         const css::uno::Sequence<OUString> aEvents =
             comphelper::TraceEvent::getRecordingAndClear();
@@ -3905,6 +3911,7 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, const char *pOption, const c
     {
         if (strcmp(pValue, "start") == 0)
         {
+            comphelper::TraceEvent::setBufferSizeAndCallback(100, TraceEventDumper::flushRecordings);
             comphelper::TraceEvent::startRecording();
             if (traceEventDumper == nullptr)
                 traceEventDumper = new TraceEventDumper();