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

fix(core): Adds Hashed & Hierarchical Timer Wheel (#655)

Browse source 
- Removes TimerPriority
- Removes TimerThread
- Adds a [Hashed & Hierarchical Timer Wheel](http://www.cs.columbia.edu/~nahum/w6998/papers/ton97-timing-wheels.pdf)
This commit is contained in:
Kamron Batman 2021-07-11 22:42:06 -07:00 • committed by GitHub
parent b99d520019
commit fb915992dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
138 changed files with 468 additions and 802 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Projects/UOContent/Engines/CannedEvil/CannedEvilTimer.cs
View file

@ -61,7 +61,6 @@ namespace Server.Engines.CannedEvil
public CannedEvilTimer() : base(TimeSpan.Zero, TimeSpan.FromMinutes(1.0))
{
Priority = TimerPriority.OneMinute;
_sliceTime = Core.Now;
}

1
Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs
View file

@ -798,7 +798,6 @@ namespace Server.Engines.ConPVP
{
m_Bomb = bomb;
m_Count = 0;
Priority = TimerPriority.FiftyMS;
}
protected override void OnTick()

2
Projects/UOContent/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -211,8 +211,6 @@ namespace Server.Engines.ConPVP
m_Hill = hill;
Captures = 0;
m_Counter = 0;
Priority = TimerPriority.FiftyMS;
}
public int Captures { get; private set; }

1
Projects/UOContent/Engines/Help/StuckMenu.cs
View file

@ -271,7 +271,6 @@ namespace Server.Menus.Questions
TimeSpan.FromSeconds(1.0)
)
{
Priority = TimerPriority.TwoFiftyMS;
m_Mobile = mobile;
m_Destination = destination;

6
Projects/UOContent/Engines/Khaldun/RaisableItem.cs
View file

@ -123,8 +123,6 @@ namespace Server.Items
m_Item = item;
m_CloseTime = Core.Now + item.CloseDelay;
m_Up = true;
Priority = TimerPriority.TenMS;
}
protected override void OnTick()
@ -154,7 +152,9 @@ namespace Server.Items
m_Step = 0;
var delay = m_CloseTime - Core.Now;
DelayCall(delay > TimeSpan.Zero ? delay : TimeSpan.Zero, Start);
static void start(Timer timer) => timer.Start();
DelayCall(delay, start, this);
return;
}

2
Projects/UOContent/Engines/Khaldun/RaiseSwitch.cs
View file

@ -131,8 +131,6 @@ namespace Server.Items
public ResetTimer(RaiseSwitch raiseSwitch, TimeSpan delay) : base(delay)
{
m_RaiseSwitch = raiseSwitch;
Priority = ComputePriority(delay);
}
protected override void OnTick()

4
Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs
View file

@ -156,7 +156,6 @@ namespace Server.Items
public EndActionTimer(Mobile from) : base(TimeSpan.FromMinutes(3.0))
{
m_From = from;
Priority = TimerPriority.FiveSeconds;
}
protected override void OnTick()
@ -289,8 +288,6 @@ namespace Server.Items
Location = location;
Map = map;
From = from;
Priority = TimerPriority.TwoFiftyMS;
}
public Point3D Location { get; }
@ -806,7 +803,6 @@ namespace Server.Items
public InternalTimer(GreenThornsSHTeleporter teleporter) : base(TimeSpan.FromMinutes(1.0))
{
m_Teleporter = teleporter;
Priority = TimerPriority.FiveSeconds;
}
protected override void OnTick()

1
Projects/UOContent/Engines/Quests/Dark Tides/Items/KronusScroll.cs
View file

@ -111,7 +111,6 @@ namespace Server.Engines.Quests.Necro
public CallingTimer(PlayerMobile player) : base(TimeSpan.Zero, TimeSpan.FromSeconds(1.0), 6)
{
Priority = TimerPriority.TwentyFiveMS;
m_Player = player;
m_Step = 0;

1
Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs
View file

@ -172,7 +172,6 @@ namespace Server.Engines.Quests.Necro
public SummonTimer(PlayerMobile player) : base(TimeSpan.FromSeconds(4.0))
{
Priority = TimerPriority.FiftyMS;
m_Player = player;
}

1
Projects/UOContent/Engines/Quests/Witch Apprentice/Items/HagStew.cs
View file

@ -57,7 +57,6 @@ namespace Server.Items
public ShowStew(AddonComponent ac) : base(TimeSpan.FromSeconds(30))
{
stew = ac;
Priority = TimerPriority.OneSecond;
}
protected override void OnTick()

16
Projects/UOContent/Engines/Spawners/BaseSpawner.cs
View file

@ -188,7 +188,7 @@ namespace Server.Engines.Spawners
[CommandProperty(AccessLevel.Developer)]
public TimeSpan NextSpawn
{
get => m_Running && m_Timer?.Running == true ? End - Core.Now : TimeSpan.FromSeconds(0);
get => m_Running && m_Timer?.Running == true ? End - Core.Now : TimeSpan.Zero;
set
{
Start();
@ -1003,12 +1003,7 @@ namespace Server.Engines.Spawners
m_HomeRange = reader.ReadInt();
m_Running = reader.ReadBool();
var ts = TimeSpan.Zero;
if (m_Running)
{
ts = reader.ReadDeltaTime() - Core.Now;
}
var ts = m_Running ? reader.ReadDeltaTime() - Core.Now : TimeSpan.Zero;
if (version < 7)
{
@ -1083,12 +1078,7 @@ namespace Server.Engines.Spawners
{
private readonly BaseSpawner m_Spawner;
public InternalTimer(BaseSpawner spawner, TimeSpan delay) : base(delay)
{
Priority = spawner.IsFull ? TimerPriority.FiveSeconds : TimerPriority.OneSecond;
m_Spawner = spawner;
}
public InternalTimer(BaseSpawner spawner, TimeSpan delay) : base(delay) => m_Spawner = spawner;
protected override void OnTick()
{