[Libreoffice-commits] core.git: Branch 'feature/priorities' - sw/source

Tobias Madl tobias.madl.dev at gmail.com
Wed Nov 5 01:41:48 PST 2014


 sw/source/core/docnode/threadmanager.cxx |   12 ++++++------
 sw/source/core/inc/threadmanager.hxx     |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a2091de039aefcd2ce6b94bd506e755c6c4f5c11
Author: Tobias Madl <tobias.madl.dev at gmail.com>
Date:   Wed Nov 5 09:40:57 2014 +0000

    changed timers to idles
    
    Change-Id: Ia9f6afb29a387c0af7d898fb69f5a3b415add7b0

diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index 2f43f77..c8353c8 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -35,7 +35,7 @@ ThreadManager::ThreadManager( uno::Reference< util::XJobManager >& rThreadJoiner
       mnThreadIDCounter( 0 ),
       maWaitingForStartThreads(),
       maStartedThreads(),
-      maStartNewThreadTimer(),
+      maStartNewThreadIdle(),
       mbStartingOfThreadsSuspended( false )
 {
 }
@@ -44,8 +44,8 @@ void ThreadManager::Init()
 {
     mpThreadListener.reset( new ThreadListener( *this ) );
 
-    maStartNewThreadTimer.SetTimeout( 2000 );
-    maStartNewThreadTimer.SetTimeoutHdl( LINK( this, ThreadManager, TryToStartNewThread ) );
+    maStartNewThreadIdle.SetPriority( VCL_IDLE_PRIORITY_LOWEST );
+    maStartNewThreadIdle.SetIdleHdl( LINK( this, ThreadManager, TryToStartNewThread ) );
 }
 
 ThreadManager::~ThreadManager()
@@ -96,7 +96,7 @@ oslInterlockedCount ThreadManager::AddThread(
             // setup Timer to start thread from waiting ones
             if ( maStartedThreads.empty() && !maWaitingForStartThreads.empty() )
             {
-                maStartNewThreadTimer.Start();
+                maStartNewThreadIdle.Start();
             }
         }
     }
@@ -214,7 +214,7 @@ IMPL_LINK_NOARG(ThreadManager, TryToStartNewThread)
             // setup Timer to start thread from waiting ones
             if ( maStartedThreads.empty() && !maWaitingForStartThreads.empty() )
             {
-                maStartNewThreadTimer.Start();
+                maStartNewThreadIdle.Start();
             }
         }
     }
@@ -238,7 +238,7 @@ void ThreadManager::ResumeStartingOfThreads()
             // setup Timer to start thread from waiting ones
             if ( maStartedThreads.empty() && !maWaitingForStartThreads.empty() )
             {
-                maStartNewThreadTimer.Start();
+                maStartNewThreadIdle.Start();
                 break;
             }
         }
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index c78cb78..54cb08b 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -123,7 +123,7 @@ class ThreadManager : public IThreadListenerOwner
         std::deque< tThreadData > maWaitingForStartThreads;
         std::deque< tThreadData > maStartedThreads;
 
-        Timer maStartNewThreadTimer;
+        Idle maStartNewThreadIdle;
 
         bool mbStartingOfThreadsSuspended;
 


More information about the Libreoffice-commits mailing list