include/vcl/scheduler.hxx | 3 +-- vcl/source/app/scheduler.cxx | 6 ++---- vcl/source/app/svapp.cxx | 7 +++---- 3 files changed, 6 insertions(+), 10 deletions(-)
New commits: commit 6da6d8cee72a8a6b4f784aff81eb66f4a1c39a31 Author: László Németh <[email protected]> Date: Thu Apr 7 04:37:36 2016 +0200 Revert "limit event processing for processEventsToIdle" This reverts commit 46e0fb8714b747f1d710673c56d96bf9c3352913. diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx index e9de235..a5f4059 100644 --- a/include/vcl/scheduler.hxx +++ b/include/vcl/scheduler.hxx @@ -96,8 +96,7 @@ public: static sal_uInt64 CalculateMinimumTimeout( bool &bHasActiveIdles, bool bIgnoreLowPriority = false ); /// Process one pending task ahead of time with highest priority. - static bool ProcessTaskScheduling( bool bTimerOnly, bool bEnableDisabledScheduler = false ); - + static bool ProcessTaskScheduling( bool bTimerOnly ); /// Process all events until we are idle static void ProcessEventsToIdle(); }; diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index a1cd3f3..9cc8669 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -157,14 +157,12 @@ void Scheduler::CallbackTaskScheduling(bool ignore) Scheduler::ProcessTaskScheduling( false ); } -bool Scheduler::ProcessTaskScheduling( bool bTimerOnly, bool bEnableDisabledScheduler ) +bool Scheduler::ProcessTaskScheduling( bool bTimerOnly ) { ImplSchedulerData* pSchedulerData; // tdf#91727 - NB. bTimerOnly is ultimately not used - static bool bDisabledScheduler = !!getenv("SAL_DISABLE_SCHEDULER"); - - if ((!bDisabledScheduler || bEnableDisabledScheduler) && (pSchedulerData = ImplSchedulerData::GetMostImportantTask(bTimerOnly))) + if ((pSchedulerData = ImplSchedulerData::GetMostImportantTask(bTimerOnly))) { SAL_INFO("vcl.schedule", "Invoke task " << pSchedulerData->GetDebugName()); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index fb5be8e..c9c2101 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -473,8 +473,7 @@ void Application::Execute() pSVData->maAppData.mbInAppExecute = false; } -inline bool ImplYield(bool i_bWait, bool i_bAllEvents, sal_uLong const nReleased, bool bIgnoreLowPrio = false, bool bEnableDisabledScheduler = false ) - +inline bool ImplYield(bool i_bWait, bool i_bAllEvents, sal_uLong const nReleased, bool bIgnoreLowPrio = false) { ImplSVData* pSVData = ImplGetSVData(); @@ -517,7 +516,7 @@ inline bool ImplYield(bool i_bWait, bool i_bAllEvents, sal_uLong const nReleased DBG_TESTSOLARMUTEX(); // must be locked on return from Yield // Process all Tasks - Scheduler::ProcessTaskScheduling(eResult == SalYieldResult::EVENT, bEnableDisabledScheduler); + Scheduler::ProcessTaskScheduling(eResult == SalYieldResult::EVENT); // flush lazy deleted objects if( pSVData->maAppData.mnDispatchLevel == 0 ) @@ -536,7 +535,7 @@ void Application::Reschedule( bool i_bAllEvents ) void Scheduler::ProcessEventsToIdle() { int nSanity = 100; - while(ImplYield(false, true, 0, true, true)) + while(ImplYield(false, true, 0, true)) { if (nSanity-- < 0) {
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
