warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes timers not stopping before OnTick (#1890)

Browse source
This commit is contained in:
Kamron Batman 2024-07-28 14:35:41 -07:00 • committed by GitHub
parent 4610712205
commit 2d9872b53a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 68 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Projects/Server/Timer/Timer.TimerWheel.cs
View file

@ -118,11 +118,6 @@ public partial class Timer
Execute(timer);
}
}
if (!timer.Running)
{
timer.OnDetach();
}
}
#if DEBUG_TIMERS
if (executionCount > _chainExecutionThreshold)
@ -141,27 +136,29 @@ public partial class Timer
{
var finished = timer.Count != 0 && ++timer.Index >= timer.Count;
var version = timer.Version;
var prof = timer.GetProfile();
prof?.Start();
// Stop the timer from running so that way if Start() is called in OnTick, the timer will be started.
if (finished)
{
timer.Stop();
}
var version = timer.Version;
timer.OnTick();
prof?.Finish();
// If the timer has not been stopped, and it has not been altered (restarted, returned etc)
if (timer.Running && timer.Version == version)
// If the timer has been altered (restarted, returned etc) then bail
if (finished || timer.Version != version)
{
if (finished)
{
timer.Stop();
}
else
{
timer.Delay = timer.Interval;
timer.Next = Core.Now + timer.Interval;
AddTimer(timer, (long)timer.Delay.TotalMilliseconds);
}
return;
}
timer.Delay = timer.Interval;
timer.Next = DateTime.UtcNow + timer.Interval;
AddTimer(timer, (long)timer.Delay.TotalMilliseconds);
}
private static void AddTimer(Timer timer, long delay)

27
Projects/Server/Timer/Timer.cs
View file

@ -153,21 +153,7 @@ public partial class Timer
Running = false;
// We are the head on the timer ring
if (_rings[_ring][_slot] == this)
{
_rings[_ring][_slot] = _nextTimer;
}
// We are the head on the executing ring
if (_executingRings[_ring] == this)
{
_executingRings[_ring] = _nextTimer;
}
Detach();
Version++;
OnDetach();
var prof = GetProfile();
@ -175,6 +161,7 @@ public partial class Timer
{
prof.Stopped++;
}
Version++;
}
protected virtual void OnTick()
@ -213,6 +200,18 @@ public partial class Timer
private void Detach()
{
// We are the head on the timer ring
if (_rings[_ring][_slot] == this)
{
_rings[_ring][_slot] = _nextTimer;
}
// We are the head on the executing ring
if (_executingRings[_ring] == this)
{
_executingRings[_ring] = _nextTimer;
}
if (_prevTimer != null)
{
_prevTimer._nextTimer = _nextTimer;

2
Projects/Server/Utilities/Utility.cs
View file

@ -746,7 +746,7 @@ public static class Utility
public static T RandomList<T>(params T[] list) => list.RandomElement();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static T RandomElement<T>(this ReadOnlySpan<T> list) => list.Length == 0 ? (T)default : list[Random(list.Length)];
public static T RandomElement<T>(this ReadOnlySpan<T> list) => list.Length == 0 ? default : list[Random(list.Length)];
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static T RandomElement<T>(this T[] list) => list.RandomElement(default);