From 87d41e3b7d0cf000346ec412ae5af10a6d162849 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Wed, 25 Nov 2015 21:38:34 +0000
Subject: vcl: cleanup scheduler debug name usage.

Change-Id: I94975d220452ca91cbbd9db5e7895fa0b3a88e4a
---
 vcl/inc/saltimer.hxx         |  3 +++
 vcl/source/app/scheduler.cxx | 20 +++++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'vcl')

diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx
index 04427ad5e769..6bd3e076c7a8 100644
--- a/vcl/inc/saltimer.hxx
+++ b/vcl/inc/saltimer.hxx
@@ -67,6 +67,9 @@ struct ImplSchedulerData
 
     void Invoke();
 
+    const char *GetDebugName() const
+        { return mpScheduler && mpScheduler->GetDebugName() ?
+                mpScheduler->GetDebugName() : "unknown"; }
     static ImplSchedulerData *GetMostImportantTask( bool bTimer );
 };
 
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 265d6f64c332..210281fa86ca 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -164,11 +164,7 @@ void Scheduler::ProcessTaskScheduling( bool bTimerOnly )
     // tdf#91727 - NB. bTimerOnly is ultimately not used
     if ((pSchedulerData = ImplSchedulerData::GetMostImportantTask(bTimerOnly)))
     {
-        // FIXME: move into a helper.
-        const char *pSchedulerName = pSchedulerData->mpScheduler->mpDebugName;
-        if (!pSchedulerName)
-            pSchedulerName = "unknown";
-        SAL_INFO("vcl.schedule", "Invoke task " << pSchedulerName);
+        SAL_INFO("vcl.schedule", "Invoke task " << pSchedulerData->GetDebugName());
 
         pSchedulerData->mnUpdateTime = tools::Time::GetSystemTicks();
         pSchedulerData->Invoke();
@@ -208,22 +204,20 @@ sal_uInt64 Scheduler::CalculateMinimumTimeout( bool &bHasActiveIdles )
         {
             if (!pSchedulerData->mbInScheduler)
             {
-                // FIXME: move into a helper.
-                const char *pSchedulerName = pSchedulerData->mpScheduler->mpDebugName;
-                if (!pSchedulerName)
-                    pSchedulerName = "unknown";
-
                 if ( !pSchedulerData->mpScheduler->IsIdle() )
                 {
                     sal_uInt64 nOldMinPeriod = nMinPeriod;
                     nMinPeriod = pSchedulerData->mpScheduler->UpdateMinPeriod(
                                                                 nOldMinPeriod, nTime );
-                    SAL_INFO("vcl.schedule", "Have active timer " << pSchedulerName <<
-                        "update min period from " << nOldMinPeriod << " to " << nMinPeriod);
+                    SAL_INFO("vcl.schedule", "Have active timer " <<
+                             pSchedulerData->GetDebugName() <<
+                             "update min period from " << nOldMinPeriod <<
+                             " to " << nMinPeriod);
                 }
                 else
                 {
-                    SAL_INFO("vcl.schedule", "Have active idle " << pSchedulerName);
+                    SAL_INFO("vcl.schedule", "Have active idle " <<
+                             pSchedulerData->GetDebugName());
                     bHasActiveIdles = true;
                 }
             }
-- 
cgit