mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

desktop: disable callback handling while changing the view

Browse Source 
When changing the view, some components are disabled
and re-enabled. This triggers a flood of invalidations
that then result in rendering requests. For each rendering
the view is set, which triggers more invalidations.

The Sidebar suffers from this, and it causes cpu pegging.
This fix prevents this issue by disabling all callbacks
during setView.

Change-Id: If6b93b2ab31f568a0761f15d945a43de1bc2d4d0
Reviewed-on: https://gerrit.libreoffice.org/84184
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/84226
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Ashod Nakashian 2019-11-30 18:14:06 -05:00 committed by Michael Meeks
parent c4ef1caaea
commit b31c39cbc8
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compilerplugins/clang/unusedmethods.results
View File

@ -128,12 +128,6 @@ dbaccess/source/ui/inc/SqlNameEdit.hxx:105
void dbaui::OSQLNameEntry::set_sensitive(_Bool)
dbaccess/source/ui/inc/WTypeSelect.hxx:76
void dbaui::OWizTypeSelectList::show()
desktop/inc/lib/init.hxx:83
void desktop::CallbackFlushHandler::setEventLatch(const _Bool)
desktop/inc/lib/init.hxx:88
_Bool desktop::CallbackFlushHandler::isEventLatchOn() const
desktop/inc/lib/init.hxx:90
_Bool desktop::CallbackFlushHandler::isPartTilePainting() const
desktop/source/lib/lokclipboard.hxx:96
LOKClipboardFactory::LOKClipboardFactory()
drawinglayer/source/tools/emfpcustomlinecap.hxx:38

19
desktop/inc/lib/init.hxx
View File

@ -79,15 +79,14 @@ namespace desktop {
static void callback(const int type, const char* payload, void* data);
void queue(const int type, const char* data);
/// When enabled events are queued but callback not invoked.
void setEventLatch(const bool bEventLatch)
{
m_bEventLatch = bEventLatch;
}
bool isEventLatchOn() const { return m_bEventLatch; }
void setPartTilePainting(const bool bPartPainting) { m_bPartTilePainting = bPartPainting; }
bool isPartTilePainting() const { return m_bPartTilePainting; }
/// Disables callbacks on this handler. Must match with identical count
/// of enableCallbacks. Used during painting and changing views.
void disableCallbacks() { ++m_nDisableCallbacks; }
/// Enables callbacks on this handler. Must match with identical count
/// of disableCallbacks. Used during painting and changing views.
void enableCallbacks() { --m_nDisableCallbacks; }
/// Returns true iff callbacks are disabled.
bool callbacksDisabled() const { return m_nDisableCallbacks != 0; }
void addViewStates(int viewId);
void removeViewStates(int viewId);
@ -140,7 +139,7 @@ namespace desktop {
LibreOfficeKitDocument* m_pDocument;
LibreOfficeKitCallback m_pCallback;
void *m_pData;
bool m_bPartTilePainting;
int m_nDisableCallbacks;
bool m_bEventLatch;
std::mutex m_mutex;
};

34
desktop/source/lib/init.cxx
View File

@ -1084,7 +1084,7 @@ CallbackFlushHandler::CallbackFlushHandler(LibreOfficeKitDocument* pDocument, Li
m_pDocument(pDocument),
m_pCallback(pCallback),
m_pData(pData),
m_bPartTilePainting(false),
m_nDisableCallbacks(0),
m_bEventLatch(false)
{
SetPriority(TaskPriority::POST_PAINT);
@ -1134,7 +1134,7 @@ void CallbackFlushHandler::queue(const int type, const char* data)
bIsChartActive = aChartHelper.GetWindow() != nullptr;
}
if (m_bPartTilePainting && !bIsChartActive)
if (callbacksDisabled() && !bIsChartActive)
{
// We drop notifications when this is set, except for important ones.
// When we issue a complex command (such as .uno:InsertAnnotation)
@ -2854,9 +2854,9 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
// Disable callbacks while we are painting.
if (nOrigViewId >= 0)
{
auto findIt = pDocument->mpCallbackFlushHandlers.find(nOrigViewId);
if (findIt != pDocument->mpCallbackFlushHandlers.end())
findIt->second->setPartTilePainting(true);
const auto handlerIt = pDocument->mpCallbackFlushHandlers.find(nOrigViewId);
if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
handlerIt->second->disableCallbacks();
}
try
@ -2909,9 +2909,9 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
if (nOrigViewId >= 0)
{
auto findIt = pDocument->mpCallbackFlushHandlers.find(nOrigViewId);
if (findIt != pDocument->mpCallbackFlushHandlers.end())
findIt->second->setPartTilePainting(false);
const auto handlerIt = pDocument->mpCallbackFlushHandlers.find(nOrigViewId);
if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
handlerIt->second->enableCallbacks();
}
}
@ -4672,14 +4672,28 @@ static void doc_destroyView(SAL_UNUSED_PARAMETER LibreOfficeKitDocument* /*pThis
SfxLokHelper::destroyView(nId);
}
static void doc_setView(SAL_UNUSED_PARAMETER LibreOfficeKitDocument* /*pThis*/, int nId)
static void doc_setView(LibreOfficeKitDocument* pThis, int nId)
{
comphelper::ProfileZone aZone("doc_setView");
SolarMutexGuard aGuard;
SetLastExceptionMsg();
SfxLokHelper::setView(nId);
LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis);
const auto handlerIt = pDocument->mpCallbackFlushHandlers.find(nId);
if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
handlerIt->second->disableCallbacks();
try
{
SfxLokHelper::setView(nId);
}
catch (const std::exception&)
{
}
if (handlerIt != pDocument->mpCallbackFlushHandlers.end())
handlerIt->second->enableCallbacks();
}
static int doc_getView(SAL_UNUSED_PARAMETER LibreOfficeKitDocument* /*pThis*/)