Add some const and fix some scheduler logging

Change-Id: Id20767ff2be34a21896d3ce2b76f3944acdb1b77

2 files changed, 13 insertions, 6 deletions

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index e9372cd52c3e..972beb741c1d 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -178,9 +178,9 @@ inline void Scheduler::UpdateSystemTimer( ImplSchedulerContext &rSchedCtx,
 {
     if ( InfiniteTimeoutMs == nMinPeriod )
     {
+        SAL_INFO("vcl.schedule", "  Stopping system timer");
         if ( rSchedCtx.mpSalTimer )
             rSchedCtx.mpSalTimer->Stop();
-        SAL_INFO("vcl.schedule", "  Stopping system timer");
         rSchedCtx.mnTimerPeriod = nMinPeriod;
     }
     else
@@ -205,9 +205,13 @@ static inline void AppendSchedulerData( ImplSchedulerContext &rSchedCtx,
 
 static inline ImplSchedulerData* DropSchedulerData(
     ImplSchedulerContext &rSchedCtx, ImplSchedulerData * const pPrevSchedulerData,
-                                     ImplSchedulerData * const pSchedulerData )
+                                     const ImplSchedulerData * const pSchedulerData )
 {
-    assert( !pPrevSchedulerData || (pPrevSchedulerData->mpNext == pSchedulerData) );
+    assert( pSchedulerData );
+    if ( pPrevSchedulerData )
+        assert( pPrevSchedulerData->mpNext == pSchedulerData );
+    else
+        assert( rSchedCtx.mpFirstSchedulerData == pSchedulerData );
 
     ImplSchedulerData * const pSchedulerDataNext = pSchedulerData->mpNext;
     if ( pPrevSchedulerData )
@@ -312,7 +316,7 @@ next_entry:
     if ( pMostUrgent )
     {
         SAL_INFO( "vcl.schedule", tools::Time::GetSystemTicks() << " "
-                  << pMostUrgent << "  invoke     " << *pMostUrgent->mpTask );
+                  << pMostUrgent << "  invoke-in  " << *pMostUrgent->mpTask );
 
         Task *pTask = pMostUrgent->mpTask;
 
@@ -328,6 +332,9 @@ next_entry:
         pTask->Invoke();
         pMostUrgent->mbInScheduler = false;
 
+        SAL_INFO( "vcl.schedule", tools::Time::GetSystemTicks() << " "
+                  << pMostUrgent << "  invoke-out" );
+
         // eventually pop the scheduler stack
         // this just happens for nested calls, which renders all accounting
         // invalid, so we just enforce a rescheduling!
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 6833c546a5ce..8e718e37e883 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -245,8 +245,8 @@ sal_uLong ImplSalReleaseYieldMutex()
         return 0;
 
     SalYieldMutex*  pYieldMutex = pInst->mpSalYieldMutex;
-    sal_uLong           nCount = pYieldMutex->GetAcquireCount( GetCurrentThreadId() );
-    sal_uLong           n = nCount;
+    const sal_uLong nCount = pYieldMutex->GetAcquireCount( GetCurrentThreadId() );
+    sal_uLong       n = nCount;
     while ( n )
     {
         pYieldMutex->release();