icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-16 21:24:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/scheduler-service-time' of Common/Utils into dev

Browse Source
This commit is contained in:
Chris Cameron
2018-07-13 20:03:12 +00:00
committed by Gogs
parent 69b97779d9 b4ef07fd45
commit f2e39566e2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ICD.Common.Utils/Services/Scheduler/ActionSchedulerService.cs
View File

@@ -13,11 +13,14 @@ namespace ICD.Common.Utils.Services.Scheduler
private readonly SafeTimer m_Timer; private readonly SafeTimer m_Timer;
private readonly SafeCriticalSection m_CriticalSection; private readonly SafeCriticalSection m_CriticalSection;
private DateTime m_LastRunTime;
public ActionSchedulerService() public ActionSchedulerService()
{ {
m_Actions = new List<IScheduledAction>(); m_Actions = new List<IScheduledAction>();
m_Timer = new SafeTimer(TimerCallback, -1); m_Timer = new SafeTimer(TimerCallback, -1);
m_CriticalSection = new SafeCriticalSection(); m_CriticalSection = new SafeCriticalSection();
m_LastRunTime = DateTime.MinValue;
} }
public void Dispose() public void Dispose()
@@ -93,13 +96,14 @@ namespace ICD.Common.Utils.Services.Scheduler
private void TimerCallback() private void TimerCallback()
{ {
DateTime currentTime = IcdEnvironment.GetLocalTime();
IScheduledAction[] actionsToRun; IScheduledAction[] actionsToRun;
m_CriticalSection.Enter(); m_CriticalSection.Enter();
try try
{ {
actionsToRun = m_Actions actionsToRun = m_Actions
.Where(a => a.NextRunTime < IcdEnvironment.GetLocalTime()) .Where(a => a.NextRunTime <= currentTime && a.NextRunTime > m_LastRunTime)
.OrderBy(a => a.NextRunTime) .OrderBy(a => a.NextRunTime)
.ToArray(); .ToArray();
} }
@@ -121,6 +125,7 @@ namespace ICD.Common.Utils.Services.Scheduler
} }
} }
m_LastRunTime = currentTime;
RescheduleTimer(); RescheduleTimer();
} }
@@ -130,7 +135,7 @@ namespace ICD.Common.Utils.Services.Scheduler
m_CriticalSection.Enter(); m_CriticalSection.Enter();
try try
{ {
var action = m_Actions.FirstOrDefault(a => a.NextRunTime != null && a.NextRunTime > IcdEnvironment.GetLocalTime()); var action = m_Actions.FirstOrDefault(a => a.NextRunTime != null && a.NextRunTime > m_LastRunTime);
if (action == null || action.NextRunTime == null) if (action == null || action.NextRunTime == null)
{ {
m_Timer.Stop(); m_Timer.Stop();
@@ -139,7 +144,7 @@ namespace ICD.Common.Utils.Services.Scheduler
long msToNextAction = (long)(action.NextRunTime.Value - IcdEnvironment.GetLocalTime()).TotalMilliseconds; long msToNextAction = (long)(action.NextRunTime.Value - IcdEnvironment.GetLocalTime()).TotalMilliseconds;
if (msToNextAction < 0) if (msToNextAction < 0)
msToNextAction = 1000; msToNextAction = 0;
m_Timer.Reset(msToNextAction); m_Timer.Reset(msToNextAction);
} }
finally finally