From de66d2e73cf44d2691d7e2e4ca8df98b46b26c10 Mon Sep 17 00:00:00 2001

From: Michael Meeks <michael.meeks@collabora.com>

Date: Fri, 13 Nov 2015 09:56:53 +0000

Subject: [PATCH] backport 5-1 idle/timers loop to 5-0

slideshow: cleanup main-loop usage, post-yield listeners, etc.

    This removes several attempts at reducing jitter in slideshow

animations. Now we have high-resolution (ie. not clamped to 10ms)

timers on Windows and a cleaner and simpler main-loop, we should

be able to use generic timer code-paths for all of this.

    This also allows us to further cleanup and simplify the main-loop

removing the now redundent post-yield handler concept. If there is a

short enough timeout, we will take just 1ms of delay before executing

a short timer anyway.

    Also removed some lingering comments from an old attempt to boost

priorities which broken audio playback.

    Tested: tdf#32861 - still works, audio still plays, no new jitter

            in animations that I tested.

Reviewed-on: https://gerrit.libreoffice.org/19947

Tested-by: Jenkins <ci@libreoffice.org>

Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

(cherry picked from commit 12dcf5e6e770b1933252a1f919663ba45ded4cdf)

Change-Id: Iadc5e2a48828a18a599a86a8df14cb2b75dd425e

---

 .../source/primitive2d/textlayoutdevice.cxx        |   5 +-

 framework/source/services/autorecovery.cxx         |   1 +

 include/sal/log-areas.dox                          |   1 +

 include/vcl/idle.hxx                               |   5 +-

 include/vcl/scheduler.hxx                          |  48 +++---

 include/vcl/svapp.hxx                              |  74 +---------

 include/vcl/timer.hxx                              |   9 +-

 sd/source/ui/slideshow/slideshowimpl.cxx           |  47 +-----

 sd/source/ui/slideshow/slideshowimpl.hxx           |   3 +-

 toolkit/source/awt/vclxtoolkit.cxx                 |   2 +-

 vcl/headless/svpinst.cxx                           |   7 +-

 vcl/inc/headless/svpinst.hxx                       |   2 +-

 vcl/inc/osx/salinst.h                              |   2 +-

 vcl/inc/salinst.hxx                                |  13 +-

 vcl/inc/saltimer.hxx                               |  17 +++

 vcl/inc/svdata.hxx                                 |   4 -

 vcl/inc/unx/gtk/gtkdata.hxx                        |   2 +-

 vcl/inc/unx/gtk/gtkinst.hxx                        |   2 +-

 vcl/inc/unx/saldisp.hxx                            |   4 +-

 vcl/inc/unx/salinst.h                              |   2 +-

 vcl/inc/win/salinst.h                              |   2 +-

 vcl/osx/salinst.cxx                                |  13 +-

 vcl/qa/cppunit/timer.cxx                           |   2 +-

 vcl/source/app/idle.cxx                            |  26 ++--

 vcl/source/app/scheduler.cxx                       | 164 +++++++++++++++------

 vcl/source/app/svapp.cxx                           |  99 +++++++------

 vcl/source/app/svmain.cxx                          |   5 -

 vcl/source/app/timer.cxx                           |  84 ++++-------

 vcl/unx/generic/app/saldata.cxx                    |  13 +-

 vcl/unx/generic/app/saldisp.cxx                    |   9 +-

 vcl/unx/generic/app/salinst.cxx                    |   6 +-

 vcl/unx/gtk/a11y/atkwrapper.cxx                    |   2 +-

 vcl/unx/gtk/app/gtkdata.cxx                        |  14 +-

 vcl/unx/gtk/app/gtkinst.cxx                        |   6 +-

 vcl/unx/kde4/KDESalDisplay.cxx                     |   9 +-

 vcl/unx/kde4/KDESalDisplay.hxx                     |   2 +-

 vcl/unx/kde4/KDEXLib.cxx                           |  16 +-

 vcl/unx/kde4/KDEXLib.hxx                           |   4 +-

 vcl/win/source/app/salinst.cxx                     |  19 ++-

 39 files changed, 390 insertions(+), 355 deletions(-)

diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx

index 2eefc3f..99dad74 100644

--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx

+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx

@@ -72,8 +72,9 @@ namespace

     };

     ImpTimedRefDev::ImpTimedRefDev(scoped_timed_RefDev& rOwnerOfMe)

-    :   mrOwnerOfMe(rOwnerOfMe),

-        mpVirDev(0L),

+    :   Timer( "Timer to destroy drawinglayer reference device" ),

+        mrOwnerOfMe(rOwnerOfMe),

+        mpVirDev(nullptr),

         mnUseCount(0L)

     {

         SetTimeout(3L * 60L * 1000L); // three minutes

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx

index 8b75271..36adb9b 100644

--- a/framework/source/services/autorecovery.cxx

+++ b/framework/source/services/autorecovery.cxx

@@ -1261,6 +1261,7 @@ AutoRecovery::AutoRecovery(const css::uno::Reference< css::uno::XComponentContex

     , m_bListenForConfigChanges (false                                          )

     , m_nAutoSaveTimeIntervall  (0                                                  )

     , m_eJob                    (AutoRecovery::E_NO_JOB                             )

+    , m_aTimer                  ( "Auto save timer" )

     , m_aAsyncDispatcher        ( LINK( this, AutoRecovery, implts_asyncDispatch )  )

     , m_eTimerType              (E_DONT_START_TIMER                                 )

     , m_nIdPool                 (0                                                  )

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox

index d734876..6cb1348 100644

--- a/include/sal/log-areas.dox

+++ b/include/sal/log-areas.dox

@@ -403,6 +403,7 @@ certain functionality.

 @li @c vcl.osx

 @li @c vcl.osx.print

 @li @c vcl.quartz

+@li @c vcl.schedule - scheduler / main-loop information

 @li @c vcl.scrollbar - Scroll Bars

 @li @c vcl.sm - Session Manager

 @li @c vcl.unity

diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx

index 2e853b7..ba892a9 100644

--- a/include/vcl/idle.hxx

+++ b/include/vcl/idle.hxx

@@ -39,8 +39,9 @@ public:

     void            SetIdleHdl( const Link<Idle *, void>& rLink ) { maIdleHdl = rLink; }

     const Link<Idle *, void>& GetIdleHdl() const { return maIdleHdl; }

     virtual void Invoke() SAL_OVERRIDE;

-    virtual bool ReadyForSchedule( bool bTimer ) SAL_OVERRIDE;

-    virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) SAL_OVERRIDE;

+    virtual bool ReadyForSchedule( bool bTimerOnly, sal_uInt64 nTimeNow ) const SAL_OVERRIDE;

+    virtual bool IsIdle() const SAL_OVERRIDE;

+    virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) const SAL_OVERRIDE;

     Idle&           operator=( const Idle& rIdle );

 };

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx

index 973565b..d9a8678 100644

--- a/include/vcl/scheduler.hxx

+++ b/include/vcl/scheduler.hxx

@@ -22,21 +22,9 @@

 #include <vcl/dllapi.h>

-struct ImplSVData;

 class Scheduler;

-struct ImplSchedulerData

-{

-    ImplSchedulerData*  mpNext;      // Pointer to the next element in list

-    Scheduler*          mpScheduler;      // Pointer to VCL Scheduler instance

-    bool                mbDelete;    // Destroy this scheduler?

-    bool                mbInScheduler;    // Scheduler currently processed?

-    sal_uInt64          mnUpdateTime;   // Last Update Time

-    sal_uInt32          mnUpdateStack;  // Update Stack

-

-    void Invoke();

-

-    static ImplSchedulerData *GetMostImportantTask( bool bTimer );

-};

+struct ImplSVData;

+struct ImplSchedulerData;

 enum class SchedulerPriority {

     HIGHEST   = 0,

@@ -51,23 +39,39 @@ enum class SchedulerPriority {

 class VCL_DLLPUBLIC Scheduler

 {

+private:

+    static void InitSystemTimer(ImplSVData* pSVData);

+

 protected:

     ImplSchedulerData*  mpSchedulerData;    /// Pointer to element in scheduler list

     const sal_Char     *mpDebugName;        /// Useful for debugging

     SchedulerPriority   mePriority;         /// Scheduler priority

     bool                mbActive;           /// Currently in the scheduler

+    // These should be constexpr static, when supported.

+    static const sal_uInt64 ImmediateTimeoutMs = 1;

+    static const sal_uInt64 MaximumTimeoutMs = 1000 * 60; // 1 minute

+

+    static void ImplStartTimer(sal_uInt64 nMS, bool bForce = false);

+

     friend struct ImplSchedulerData;

     virtual void SetDeletionFlags();

-    virtual bool ReadyForSchedule( bool bTimer ) = 0;

-    virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) = 0;

+    /// Is this item ready to be dispatched at @nTimeNow

+    virtual bool ReadyForSchedule( bool bTimerOnly, sal_uInt64 nTimeNow ) const = 0;

+    /// Schedule only when other timers and events are processed

+    virtual bool IsIdle() const = 0;

+    /**

+     * Adjust @nMinPeriod downwards if we want to be notified before

+     * then, @nTimeNow is the current time.

+     */

+    virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const = 0;

 public:

     Scheduler( const sal_Char *pDebugName = NULL );

     Scheduler( const Scheduler& rScheduler );

     virtual ~Scheduler();

-    void SetPriority( SchedulerPriority ePriority );

+    void SetPriority(SchedulerPriority ePriority) { mePriority = ePriority; }

     SchedulerPriority GetPriority() const { return mePriority; }

     void            SetDebugName( const sal_Char *pDebugName ) { mpDebugName = pDebugName; }

@@ -82,13 +86,17 @@ public:

     bool            IsActive() const { return mbActive; }

     void            SetInActive() { mbActive = false; }

-    Scheduler&          operator=( const Scheduler& rScheduler );

+    Scheduler&      operator=( const Scheduler& rScheduler );

     static void ImplDeInitScheduler();

     // Process one pending Timer with highhest priority

     static void CallbackTaskScheduling( bool ignore );

-    /// Process one pending task ahead of time with highhest priority.

-    static void ProcessTaskScheduling( bool bTimer );

+    /// Calculate minimum timeout - and return its value.

+    static sal_uInt64 CalculateMinimumTimeout( bool &bHasActiveIdles );

+    /// Process one pending task ahead of time with highest priority.

+    static bool       ProcessTaskScheduling( bool bTimerOnly );

+    /// Process all events until we are idle

+    static void       ProcessEventsToIdle();

 };

 #endif // INCLUDED_VCL_SCHEDULER_HXX

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx

index 78f758c..716a987 100644

--- a/include/vcl/svapp.hxx

+++ b/include/vcl/svapp.hxx

@@ -459,8 +459,6 @@ public:

      @see Quit, Reschedule, Yield, EndYield, GetSolarMutex,

           GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,

-          RemovePostYieldListener

     */

     static void                 Execute();

@@ -468,8 +466,6 @@ public:

      @see Execute, Reschedule, Yield, EndYield, GetSolarMutex,

           GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,

-          RemovePostYieldListener

     */

     static void                 Quit();

@@ -481,8 +477,6 @@ public:

      @see Execute, Quit, Yield, EndYield, GetSolarMutex,

           GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,

-          RemovePostYieldListener

      */

     static void                 Reschedule( bool bAllEvents = false );

@@ -490,8 +484,6 @@ public:

      @see Execute, Quit, Reschedule, EndYield, GetSolarMutex,

           GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,

-          RemovePostYieldListener

     */

     static void                 Yield();

@@ -499,11 +491,15 @@ public:

      @see Execute, Quit, Reschedule, Yield, GetSolarMutex,

           GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,

-          RemovePostYieldListener

     */

     static void                 EndYield();

+    /** Acquire SolarMutex after it has been temporarily dropped completely.

+

+        This will Reschedule() on WNT and just acquire on other platforms.

+    */

+    static void                 ReAcquireSolarMutex(sal_uLong nReleased);

+

     /** @brief Get the Solar Mutex for this thread.

      Get the Solar Mutex that prevents other threads from accessing VCL

@@ -513,8 +509,6 @@ public:

      @see Execute, Quit, Reschedule, Yield, EndYield,

           GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,

-          RemovePostYieldListener

     */

     static comphelper::SolarMutex& GetSolarMutex();

@@ -524,8 +518,6 @@ public:

      @see Execute, Quit, Reschedule, Yield, EndYield, GetSolarMutex,

           ReleaseSolarMutex, AcquireSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,

-          RemovePostYieldListener

     */

     static oslThreadIdentifier  GetMainThreadIdentifier();

@@ -538,8 +530,6 @@ public:

      @see Execute, Quit, Reschedule, Yield, EndYield, GetSolarMutex,

           GetMainThreadIdentifier, AcquireSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,

-          RemovePostYieldListener

     */

     static sal_uLong            ReleaseSolarMutex();

@@ -550,59 +540,9 @@ public:

      @see Execute, Quit, Reschedule, Yield, EndYield, GetSolarMutex,

           GetMainThreadIdentifier, ReleaseSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,

-          RemovePostYieldListener

     */

     static void                 AcquireSolarMutex( sal_uLong nCount );

-    /** @brief Enables "no yield" mode

-

-     "No yield" mode prevents Yield() from waiting for events.

-

-     @remarks This was originally implemented in OOo bug 98792 to improve

-        Impress slideshows.

-

-     @see DisableNoYieldMode, Execute, Quit, Reschedule, Yield, EndYield, GetSolarMutex,

-          GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          DisableNoYield, AddPostYieldListener, RemovePostYieldListener

-    */

-    static void                 EnableNoYieldMode();

-

-    /** @brief Disables "no yield" mode

-

-     "No yield" mode prevents Yield() from waiting for events.

-

-     @remarks This was originally implemented in OOo bug 98792 to improve

-        Impress slideshows.

-

-     @see EnableNoYieldMode, Execute, Quit, Reschedule, Yield, EndYield, GetSolarMutex,

-          GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          EnableNoYield, AddPostYieldListener, RemovePostYieldListener

-    */

-

-    static void                 DisableNoYieldMode();

-

-    /** Add a listener for yield events

-

-     @param  i_rListener     Listener to add

-

-     @see Execute, Quit, Reschedule, Yield, EndYield, GetSolarMutex,

-          GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          EnableNoYieldMode, DisableNoYieldMode, RemovePostYieldListener

-    */

-    static void                 AddPostYieldListener( const Link<>& i_rListener );

-

-    /** Remove listener for yield events

-

-     @param  i_rListener     Listener to remove

-

-     @see Execute, Quit, Reschedule, Yield, EndYield, GetSolarMutex,

-          GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,

-          AddPostYieldListener, EnableNoYieldMode, DisableNoYieldMode

-    */

-    static void                 RemovePostYieldListener( const Link<>& i_rListener );

-

-

     /** Queries whether the application is in "main", i.e. not yet in

         the event loop

@@ -1687,7 +1627,7 @@ public:

     ~SolarMutexReleaser()

     {

-        Application::AcquireSolarMutex( mnReleased );

+        Application::ReAcquireSolarMutex(mnReleased);

     }

 };

diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx

index 8835291..d3abf1f 100644

--- a/include/vcl/timer.hxx

+++ b/include/vcl/timer.hxx

@@ -31,11 +31,9 @@ protected:

     bool            mbAuto;

     virtual void SetDeletionFlags() SAL_OVERRIDE;

-    virtual bool ReadyForSchedule( bool bTimer ) SAL_OVERRIDE;

-    virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) SAL_OVERRIDE;

-

-private:

-    static void InitSystemTimer();

+    virtual bool ReadyForSchedule( bool bTimerOnly, sal_uInt64 nTimeNow ) const SAL_OVERRIDE;

+    virtual bool IsIdle() const SAL_OVERRIDE;

+    virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTime ) const SAL_OVERRIDE;

 public:

     Timer( const sal_Char *pDebugName = NULL );

@@ -51,7 +49,6 @@ public:

     void            Timeout() { Invoke(); }

     Timer&          operator=( const Timer& rTimer );

     virtual void    Start() SAL_OVERRIDE;

-    static void     ImplStartTimer( ImplSVData* pSVData, sal_uInt64 nMS );

 };

 /// An auto-timer is a multi-shot timer re-emitting itself at

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx

index bf61d37..c1e1064 100644

--- a/sd/source/ui/slideshow/slideshowimpl.cxx

+++ b/sd/source/ui/slideshow/slideshowimpl.cxx

@@ -538,6 +538,8 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,

         mpOldActiveWindow = mpViewShell->GetActiveWindow();

     maUpdateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, updateHdl));

+    // Priority must not be too high or we'll starve input handling etc.

+    maUpdateTimer.SetPriority(SchedulerPriority::REPAINT);

     maDeactivateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, deactivateHdl));

     maDeactivateTimer.SetTimeout( 20 );

@@ -746,9 +748,6 @@ void SAL_CALL SlideshowImpl::disposing()

     setActiveXToolbarsVisible( true );

-    Application::DisableNoYieldMode();

-    Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));

-

     mbDisposed = true;

 }

@@ -1789,22 +1788,6 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, updateHdl, Timer *, void)

     updateSlideShow();

 }

-IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener)

-{

-    // prevent me from deletion when recursing (App::Reschedule does)

-    const rtl::Reference<SlideshowImpl> this_(this);

-

-    Application::DisableNoYieldMode();

-    Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));

-    Application::Reschedule(true); // fix for fdo#32861 - process

-                                   // *all* outstanding events after

-                                   // yield is done.

-    if (mbDisposed)

-        return 0;

-    Application::Reschedule(true);

-    return updateSlideShow();

-}

-

 sal_Int32 SlideshowImpl::updateSlideShow()

 {

     // prevent me from deletion when recursing (App::EnableYieldMode does)

@@ -1816,26 +1799,13 @@ sal_Int32 SlideshowImpl::updateSlideShow()

     try

     {

-        // TODO(Q3): Evaluate under various systems and setups,

-        // whether this is really necessary. Under WinXP and Matrox

-        // G550, the frame rates were much more steadier with this

-        // tweak, although.

-

-        // currently no solution, because this kills sound (at least on Windows)

-

         double fUpdate = 0.0;

         if( !xShow->update(fUpdate) )

             fUpdate = -1.0;

         if (mxShow.is() && (fUpdate >= 0.0))

         {

-            if (::basegfx::fTools::equalZero(fUpdate))

-            {

-                // Use post yield listener for short update intervalls.

-                Application::EnableNoYieldMode();

-                Application::AddPostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));

-            }

-            else

+            if (!::basegfx::fTools::equalZero(fUpdate))

             {

                 // Avoid busy loop when the previous call to update()

                 // returns a small positive number but not 0 (which is

@@ -1852,14 +1822,11 @@ sal_Int32 SlideshowImpl::updateSlideShow()

                 // too high (only then conversion to milliseconds and long

                 // integer may lead to zero value.)

                 OSL_ASSERT(static_cast<sal_uLong>(fUpdate * 1000.0) > 0);

-

-                Application::DisableNoYieldMode();

-                Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));

-

-                // Use a timer for the asynchronous callback.

-                maUpdateTimer.SetTimeout(static_cast<sal_uLong>(fUpdate * 1000.0));

-                maUpdateTimer.Start();

             }

+

+            // Use our high resolution timers for the asynchronous callback.

+            maUpdateTimer.SetTimeout(static_cast<sal_uLong>(fUpdate * 1000.0));

+            maUpdateTimer.Start();

         }

     }

     catch( Exception& )

diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx

index 3e8f00f..f75b1b7 100644

--- a/sd/source/ui/slideshow/slideshowimpl.hxx

+++ b/sd/source/ui/slideshow/slideshowimpl.hxx

@@ -275,7 +275,6 @@ private:

     void setActiveXToolbarsVisible( bool bVisible );

     DECL_LINK_TYPED(updateHdl, Timer *, void);

-    DECL_LINK( PostYieldListener, void* );

     DECL_LINK_TYPED(ReadyForNextInputHdl, Timer *, void);

     DECL_LINK( endPresentationHdl, void* );

     DECL_LINK( ContextMenuSelectHdl, Menu * );

@@ -311,7 +310,7 @@ private:

     static void setAutoSaveState( bool bOn );

     void gotoPreviousSlide (const bool bSkipAllMainSequenceEffects);

-    /** Called by PostYieldListener and updateHdl handlers this method is

+    /** Called by our maUpdateTimer's updateHdl handler this method is

         responsible to call the slideshow update() method and, depending on

         its return value, wait for a certain amount of time before another

         call to update() is scheduled.

diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx

index ee1f9b8..f11e167 100644

--- a/toolkit/source/awt/vclxtoolkit.cxx

+++ b/toolkit/source/awt/vclxtoolkit.cxx

@@ -1892,7 +1892,7 @@ void SAL_CALL VCLXToolkit::processEventsToIdle()

     throw (::com::sun::star::uno::RuntimeException, std::exception)

 {

     SolarMutexGuard aSolarGuard;

-    Scheduler::ProcessTaskScheduling(false);

+    Scheduler::ProcessEventsToIdle();

 }

 }

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx

index 7c94f66..39dfe25 100644

--- a/vcl/headless/svpinst.cxx

+++ b/vcl/headless/svpinst.cxx

@@ -259,8 +259,10 @@ SalBitmap* SvpSalInstance::CreateSalBitmap()

 #endif

 }

-void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )

+SalYieldResult SvpSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong const nReleased)

 {

+    (void) nReleased;

+    assert(nReleased == 0); // not implemented

     // first, check for already queued events.

     // release yield mutex

@@ -324,6 +326,9 @@ void SvpSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )

         DoReleaseYield(nTimeoutMS);

     }

+

+    return bEvent ? SalYieldResult::EVENT :

+                    SalYieldResult::TIMEOUT;

 }

 void SvpSalInstance::DoReleaseYield( int nTimeoutMS )

diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx

index 44795d5..0d11b1d 100644

--- a/vcl/inc/headless/svpinst.hxx

+++ b/vcl/inc/headless/svpinst.hxx

@@ -157,7 +157,7 @@ public:

     // wait next event and dispatch

     // must returned by UserEvent (SalFrame::PostEvent)

     // and timer

-    virtual void            Yield( bool bWait, bool bHandleAllCurrentEvents ) SAL_OVERRIDE;

+    virtual SalYieldResult  DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) SAL_OVERRIDE;

     virtual bool            AnyInput( VclInputFlags nType ) SAL_OVERRIDE;

     // may return NULL to disable session management

diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h

index b2d6133..9df7d02 100644

--- a/vcl/inc/osx/salinst.h

+++ b/vcl/inc/osx/salinst.h

@@ -109,7 +109,7 @@ public:

     virtual sal_uLong       ReleaseYieldMutex() SAL_OVERRIDE;

     virtual void            AcquireYieldMutex( sal_uLong nCount ) SAL_OVERRIDE;

     virtual bool            CheckYieldMutex() SAL_OVERRIDE;

-    virtual void            Yield( bool bWait, bool bHandleAllCurrentEvents ) SAL_OVERRIDE;

+    virtual +SalYieldResult DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) SAL_OVERRIDE;

     virtual bool            AnyInput( VclInputFlags nType ) SAL_OVERRIDE;

     virtual SalMenu*        CreateMenu( bool bMenuBar, Menu* pVCLMenu ) SAL_OVERRIDE;

     virtual void            DestroyMenu( SalMenu* ) SAL_OVERRIDE;

diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx

index eb53177..f49bb4c 100644

--- a/vcl/inc/salinst.hxx

+++ b/vcl/inc/salinst.hxx

@@ -58,6 +58,8 @@ struct SystemWindowData;

 class Menu;

 enum class VclInputFlags;

+enum SalYieldResult { EVENT, TIMEOUT };

+

 class VCL_PLUGIN_PUBLIC SalInstance

 {

 private:

@@ -124,10 +126,13 @@ public:

     // return true, if yield mutex is owned by this thread, else false

     virtual bool            CheckYieldMutex() = 0;

-    // wait next event and dispatch

-    // must returned by UserEvent (SalFrame::PostEvent)

-    // and timer

-    virtual void            Yield( bool bWait, bool bHandleAllCurrentEvents ) = 0;

+    /**

+     * Wait for the next event (if @bWait) and dispatch it,

+     * includes posted events, and timers.

+     * If @bHandleAllCurrentEvents - dispatch multiple posted

+     * user events. Returns true if events needed processing.

+     */

+    virtual SalYieldResult  DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) = 0;

     virtual bool            AnyInput( VclInputFlags nType ) = 0;

     // menus

diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx

index 1e1a941..3907ec1 100644

--- a/vcl/inc/saltimer.hxx

+++ b/vcl/inc/saltimer.hxx

@@ -54,6 +54,23 @@ public:

     }

 };

+class Scheduler;

+

+// Internal scheduler record holding intrusive linked list pieces

+struct ImplSchedulerData

+{

+    ImplSchedulerData*  mpNext;        // Pointer to the next element in list

+    Scheduler*          mpScheduler;   // Pointer to VCL Scheduler instance

+    bool                mbDelete;      // Destroy this scheduler?

+    bool                mbInScheduler; // Scheduler currently processed?

+    sal_uInt64          mnUpdateTime;  // Last Update Time

+

+    void Invoke();

+

+    const char *GetDebugName() const;

+    static ImplSchedulerData *GetMostImportantTask( bool bTimer );

+};

+

 #endif // INCLUDED_VCL_INC_SALTIMER_HXX

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx

index 5e3282a..99cb2e3 100644

--- a/vcl/inc/svdata.hxx

+++ b/vcl/inc/svdata.hxx

@@ -125,7 +125,6 @@ struct ImplSVAppData

     VclPtr<ImplWheelWindow> mpWheelWindow;                  // WheelWindow

     ImplHotKey*             mpFirstHotKey;                  // HotKey-Verwaltung

     ImplEventHook*          mpFirstEventHook;               // Event-Hooks

-    VclEventListeners2*     mpPostYieldListeners;           // post yield listeners

     sal_uInt64              mnLastInputTime;                // GetLastInputTime()

     sal_uInt16              mnDispatchLevel;                // DispatchLevel

     sal_uInt16              mnModalMode;                    // ModalMode Count

@@ -137,8 +136,6 @@ struct ImplSVAppData

     bool                    mbInAppExecute;                 // is Application::Execute() on stack

     bool                    mbAppQuit;                      // is Application::Quit() called

     bool                    mbSettingsInit;                 // true: Settings are initialized

-    bool                    mbNoYield;                      // Application::Yield will not wait for events if the queue is empty

-                                                            // essentially that makes it the same as Application::Reschedule

     Application::DialogCancelMode meDialogCancel;           // true: All Dialog::Execute() calls will be terminated immediately with return false

     /** Controls whether showing any IME status window is toggled on or off.

@@ -321,7 +318,6 @@ struct ImplSVData

     SalSystem*              mpSalSystem;                    // SalSystem interface

     ResMgr*                 mpResMgr;                       // SV-Resource-Manager

     sal_uInt64              mnTimerPeriod;                  // current timer period

-    sal_uInt32              mnUpdateStack;                  // Scheduler on stack

     ImplSVAppData           maAppData;                      // indepen data for class Application

     ImplSVGDIData           maGDIData;                      // indepen data for Output classes

     ImplSVWinData           maWinData;                      // indepen data for Windows classes

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx

index 697fece..3a800b3 100644

--- a/vcl/inc/unx/gtk/gtkdata.hxx

+++ b/vcl/inc/unx/gtk/gtkdata.hxx

@@ -115,7 +115,7 @@ public:

     static gboolean userEventFn( gpointer data );

     void PostUserEvent();

-    void Yield( bool bWait, bool bHandleAllCurrentEvents );

+    SalYieldResult Yield( bool bWait, bool bHandleAllCurrentEvents );

     inline GdkDisplay *GetGdkDisplay();

     virtual void ErrorTrapPush() SAL_OVERRIDE;

diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx

index 28bca36..189b6900 100644

--- a/vcl/inc/unx/gtk/gtkinst.hxx

+++ b/vcl/inc/unx/gtk/gtkinst.hxx

@@ -80,7 +80,7 @@ public:

                                                      const SystemGraphicsData* ) SAL_OVERRIDE;

     virtual SalBitmap*          CreateSalBitmap() SAL_OVERRIDE;

-    virtual void                Yield( bool bWait, bool bHandleAllCurrentEvents ) SAL_OVERRIDE;

+    virtual SalYieldResult                DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) SAL_OVERRIDE;

     virtual bool                AnyInput( VclInputFlags nType ) SAL_OVERRIDE;

     virtual GenPspGraphics     *CreatePrintGraphics() SAL_OVERRIDE;

diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx

index a304a4b..776cb64 100644

--- a/vcl/inc/unx/saldisp.hxx

+++ b/vcl/inc/unx/saldisp.hxx

@@ -155,7 +155,7 @@ public:

     virtual         ~SalXLib();

     virtual void    Init();

-    virtual void    Yield( bool bWait, bool bHandleAllCurrentEvents );

+    virtual SalYieldResult Yield( bool bWait, bool bHandleAllCurrentEvents );

     virtual void    Wakeup();

     virtual void    PostUserEvent();

@@ -382,7 +382,7 @@ public:

     virtual ~SalX11Display();

     virtual bool        Dispatch( XEvent *pEvent ) SAL_OVERRIDE;

-    virtual void        Yield();

+    virtual bool        Yield();

     virtual void        PostUserEvent() SAL_OVERRIDE;

     bool                IsEvent();

diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h

index 381ddda..72939e8 100644

--- a/vcl/inc/unx/salinst.h

+++ b/vcl/inc/unx/salinst.h