diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-11-25 21:38:34 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-11-26 22:17:34 +0000 |
| commit | 577736c3ce131d09e89df27b978b3d84e5bca380 (patch) | |
| tree | b504ced894f1c8d901f90c9758ba0bafe18a2a09 /vcl | |
| parent | 3853d5ffbf118c83302973bc69c88a0e93e1f937 (diff) | |
vcl: cleanup scheduler debug name usage.
Change-Id: I94975d220452ca91cbbd9db5e7895fa0b3a88e4a
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/saltimer.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/scheduler.cxx | 20 |
2 files changed, 10 insertions, 13 deletions
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; } } |