From c926974ec1a4dbb72f273927fed0bc2f5e19c374 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 30 Apr 2021 17:06:59 +0200 Subject: [PATCH] sw: add some SAL_INFO on DoIdleJob interrupt Change-Id: I44df06ab4bad1a5e0aaf5409590f5d7869f33482 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114937 Tested-by: Jenkins Reviewed-by: Michael Stahl --- bin/convwatch.py | 2 ++ sw/source/core/layout/layact.cxx | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/bin/convwatch.py b/bin/convwatch.py index d88d43d64a6f..93082186f319 100644 --- a/bin/convwatch.py +++ b/bin/convwatch.py @@ -280,6 +280,7 @@ def loadFromURL(xContext, url): xDoc = None try: xDoc = xDesktop.loadComponentFromURL(url, "_blank", 0, loadProps) + log("...loadComponentFromURL done") if xDoc is None: raise Exception("No document loaded?") time_ = 0 @@ -328,6 +329,7 @@ class LoadPrintFileTest: else: url = "file://" + quote(self.file) xDoc = loadFromURL(xContext, url) + log("loadFromURL in: " + str(datetime.datetime.now() - start)) printDoc(xContext, xDoc, url + self.prtsuffix) finally: if xDoc: diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 422b8aee0c46..4a811e171ddc 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2088,7 +2088,10 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly ) while( pCnt && pPage->IsAnLower( pCnt ) ) { if ( DoIdleJob_( pCnt, eJob ) ) + { + SAL_INFO("sw.idle", "DoIdleJob " << eJob << " interrupted on page " << pPage->GetPhyPageNum()); return true; + } pCnt = pCnt->GetNextContentFrame(); } if ( pPage->GetSortedObjs() ) @@ -2105,7 +2108,10 @@ bool SwLayIdle::DoIdleJob( IdleJobType eJob, bool bVisAreaOnly ) if ( pC->IsTextFrame() ) { if ( DoIdleJob_( pC, eJob ) ) + { + SAL_INFO("sw.idle", "DoIdleJob " << eJob << " interrupted on page " << pPage->GetPhyPageNum()); return true; + } } pC = pC->GetNextContentFrame(); }