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

2
.github/workflows/build-test.yml vendored
View file

@ -26,7 +26,7 @@ jobs:
- name: Setup .NET 5
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.203
dotnet-version: 5.0.301
- name: Build
run: ./publish.cmd
- name: Test

5
Directory.Build.props
View file

@ -54,7 +54,10 @@
<AnalysisLevel>latest</AnalysisLevel>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.194">
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.220">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

8
ModernUO.sln
View file

@ -14,8 +14,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks", "Projects\Benc
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SerializationGenerator", "Projects\SerializationGenerator\SerializationGenerator.csproj", "{07DDB8CF-F926-44F4-A584-FF2997D2C9D0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SerializationGenerator.Tests", "Projects\SerializationGenerator.Tests\SerializationGenerator.Tests.csproj", "{2BC92375-BB66-4CA5-B39C-36215749FE64}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SerializationSchemaGenerator", "Projects\SerializationSchemaGenerator\SerializationSchemaGenerator.csproj", "{A30150A3-796C-4C6D-B3E4-B7BEB0021701}"
EndProject
Global
@ -61,12 +59,6 @@ Global
{07DDB8CF-F926-44F4-A584-FF2997D2C9D0}.Debug|x64.Build.0 = Debug|x64
{07DDB8CF-F926-44F4-A584-FF2997D2C9D0}.Release|x64.ActiveCfg = Release|x64
{07DDB8CF-F926-44F4-A584-FF2997D2C9D0}.Release|x64.Build.0 = Release|x64
{2BC92375-BB66-4CA5-B39C-36215749FE64}.Analyze|x64.ActiveCfg = Analyze|x64
{2BC92375-BB66-4CA5-B39C-36215749FE64}.Analyze|x64.Build.0 = Analyze|x64
{2BC92375-BB66-4CA5-B39C-36215749FE64}.Debug|x64.ActiveCfg = Debug|x64
{2BC92375-BB66-4CA5-B39C-36215749FE64}.Debug|x64.Build.0 = Debug|x64
{2BC92375-BB66-4CA5-B39C-36215749FE64}.Release|x64.ActiveCfg = Release|x64
{2BC92375-BB66-4CA5-B39C-36215749FE64}.Release|x64.Build.0 = Release|x64
{A30150A3-796C-4C6D-B3E4-B7BEB0021701}.Analyze|x64.ActiveCfg = Analyze|x64
{A30150A3-796C-4C6D-B3E4-B7BEB0021701}.Analyze|x64.Build.0 = Analyze|x64
{A30150A3-796C-4C6D-B3E4-B7BEB0021701}.Debug|x64.ActiveCfg = Debug|x64

3
Projects/Benchmarks/Benchmarks.csproj
View file

@ -10,9 +10,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<ProjectReference Include="..\Server\Server.csproj" />
<ProjectReference Include="..\UOContent\UOContent.csproj" />
</ItemGroup>

22
Projects/SerializationGenerator.Tests/SerializationGenerator.Tests.csproj
View file

@ -1,22 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SerializationGenerator\SerializationGenerator.csproj" />
</ItemGroup>
</Project>

23
Projects/SerializationGenerator.Tests/Tests/GenerateClassTests.cs
View file

@ -1,23 +0,0 @@
using System.Collections.Immutable;
using System.Text;
using Microsoft.CodeAnalysis;
using SerializationGenerator;
using Xunit;
namespace SerializationGeneratorTests
{
public class GenerateClassTests
{
[Fact]
public void Test1()
{
var source = new StringBuilder();
source.GenerateClassStart(
"TestClass",
ImmutableArray<ITypeSymbol>.Empty
);
Assert.NotEmpty(source.ToString());
}
}
}

3
Projects/Server.Tests/Fixtures/ServerFixture.cs
View file

@ -18,12 +18,15 @@ namespace Server.Tests
// Configure the world
World.Configure();
Timer.Initialize(0);
// Load the world
World.Load();
}
public void Dispose()
{
Timer.Initialize(0);
}
}
}

5
Projects/Server.Tests/Tests/Network/Packets/Outgoing/MobilePacketTests.cs
View file

@ -4,6 +4,7 @@ using Xunit;
namespace Server.Tests.Network
{
[Collection("Sequential Tests")]
public class MobilePacketTests : IClassFixture<ServerFixture>
{
[Fact]
@ -328,11 +329,7 @@ namespace Server.Tests.Network
var result = ns.SendPipe.Reader.TryRead();
AssertThat.Equal(result.Buffer[0].AsSpan(0), expected);
}
}
[Collection("Sequential Tests")]
public class SequentialMobilePacketTests : IClassFixture<ServerFixture>
{
[Fact]
public void TestMobileHits()
{

1
Projects/Server.Tests/Tests/Network/Packets/Outgoing/PlayerPacketTests.cs
View file

@ -5,6 +5,7 @@ using Xunit;
namespace Server.Tests.Network
{
[Collection("Sequential Tests")]
public class PlayerPacketTests : IClassFixture<ServerFixture>
{
[Theory]

1
Projects/Server.Tests/Tests/Network/Packets/Outgoing/VendorBuyPacketTests.cs
View file

@ -6,6 +6,7 @@ using Xunit;
namespace Server.Tests.Network
{
[Collection("Sequential Tests")]
public class VendorBuyPacketTests : IClassFixture<ServerFixture>
{
[Theory]

1
Projects/Server.Tests/Tests/Network/Packets/Outgoing/VendorSellPacketTests.cs
View file

@ -5,6 +5,7 @@ using Xunit;
namespace Server.Tests.Network
{
[Collection("Sequential Tests")]
public class VendorSellPacketTests : IClassFixture<ServerFixture>
{
[Fact]

78
Projects/Server.Tests/Tests/Timer/TimerTests.cs Normal file
View file

@ -0,0 +1,78 @@
using System;
using Xunit;
namespace Server.Tests
{
[Collection("Sequential Tests")]
public class TimerTests : IClassFixture<ServerFixture>
{
[Theory]
[InlineData(0L, 8L)]
[InlineData(80L, 80L)]
[InlineData(65L, 72L)]
[InlineData(32767L, 32768L)]
[InlineData(32768L, 32768L)]
[InlineData(32833L, 32840L)]
[InlineData(134217729L, 134217736L)]
public void TestVariousTimes(long ticks, long expectedTicks)
{
var timerTicks = new TimerTicks();
void action()
{
Assert.Equal(expectedTicks, timerTicks.Ticks);
timerTicks.ExecutedCount++;
}
Timer.Initialize(timerTicks.Ticks);
var timer = Timer.DelayCall(TimeSpan.FromMilliseconds(ticks), action);
timer.Start();
var tickCount = expectedTicks / 8;
for (int i = 1; i <= tickCount; i++)
{
timerTicks.Ticks = i * 8;
Timer.Slice(timerTicks.Ticks);
}
Assert.Equal(1, timerTicks.ExecutedCount);
}
[Theory]
[InlineData(1000L, 1000L, 30000L, 30000L, 2)]
public void TestIntervals(long delay, long expectedDelayTicks, long interval, long expectedIntervalTicks, int count)
{
var timerTicks = new TimerTicks();
void action()
{
timerTicks.ExpectedTicks += timerTicks.ExecutedCount++ == 0 ? expectedDelayTicks : expectedIntervalTicks;
Assert.Equal(timerTicks.ExpectedTicks, timerTicks.Ticks);
}
Timer.Initialize(timerTicks.Ticks);
var timer = Timer.DelayCall(TimeSpan.FromMilliseconds(delay), TimeSpan.FromMilliseconds(interval), count, action);
timer.Start();
var tickCount = (expectedDelayTicks + (expectedIntervalTicks * count - 1)) / 8;
for (int i = 1; i <= tickCount; i++)
{
timerTicks.Ticks = i * 8;
Timer.Slice(timerTicks.Ticks);
}
Assert.Equal(count, timerTicks.ExecutedCount);
}
private class TimerTicks
{
public long ExpectedTicks;
public long Ticks;
public int ExecutedCount;
}
}
}

2
Projects/Server/AssemblyHandler.cs
View file

@ -67,7 +67,7 @@ namespace Server
for (int i = 0; i < types.Length; i++)
{
var m = types[i].GetMethod(method, BindingFlags.Static | BindingFlags.Public);
if (m != null)
if (m?.GetParameters().Length == 0)
{
list.Add(m);
}

21
Projects/Server/Main.cs
View file

@ -36,7 +36,6 @@ namespace Server
private static readonly ILogger logger = LogFactory.GetLogger(typeof(Core));
private static bool _crashed;
private static Thread _timerThread;
private static string _baseDirectory;
private static bool _profiling;
@ -127,8 +126,8 @@ namespace Server
// For Unix Stopwatch.Frequency is normalized to 1ns
// We don't anticipate needing this for Windows/OSX
private static long _maxTickCountBeforePrecisionLoss = long.MaxValue / 1000L;
private static long _ticksPerMillisecond = Stopwatch.Frequency / 1000L;
private const long _maxTickCountBeforePrecisionLoss = long.MaxValue / 1000L;
private static readonly long _ticksPerMillisecond = Stopwatch.Frequency / 1000L;
public static long TickCount
{
@ -145,6 +144,8 @@ namespace Server
// No precision loss
: 1000L * timestamp / Stopwatch.Frequency;
}
// Setting this to a value lower than the previous is bad. Timers will become delayed
// until time catches up.
set => _tickCount = value;
}
@ -358,8 +359,6 @@ namespace Server
{
EventSink.InvokeShutdown();
}
Timer.TimerThread.Set();
}
public static void Main(string[] args)
@ -420,12 +419,6 @@ namespace Server
logger.Information($"Running on {RuntimeInformation.FrameworkDescription}");
var ttObj = new Timer.TimerThread();
_timerThread = new Thread(ttObj.TimerMain)
{
Name = "Timer Thread"
};
var s = Arguments;
if (s.Length > 0)
@ -474,6 +467,8 @@ namespace Server
VerifySerialization();
Timer.Initialize(TickCount);
AssemblyHandler.Invoke("Configure");
TileMatrixLoader.LoadTileMatrix();
@ -483,8 +478,6 @@ namespace Server
AssemblyHandler.Invoke("Initialize");
_timerThread.Start();
TcpServer.Start();
EventSink.InvokeServerStarted();
RunEventLoop();
@ -504,7 +497,7 @@ namespace Server
var events = Mobile.ProcessDeltaQueue();
events += Item.ProcessDeltaQueue();
events += Timer.Slice();
events += Timer.Slice(_tickCount);
// Handle networking
events += TcpServer.Slice();

31
Projects/Server/Mobiles/Mobile.cs
View file

@ -1157,16 +1157,6 @@ namespace Server
{
m_Player = value;
InvalidateProperties();
if (!m_Player && m_Dex <= 100 && m_CombatTimer != null)
{
m_CombatTimer.Priority = TimerPriority.FiftyMS;
}
else if (m_CombatTimer != null)
{
m_CombatTimer.Priority = TimerPriority.EveryTick;
}
CheckStatTimers();
}
}
@ -6546,15 +6536,6 @@ namespace Server
CheckStatTimers();
}
if (!m_Player && m_Dex <= 100 && m_CombatTimer != null)
{
m_CombatTimer.Priority = TimerPriority.FiftyMS;
}
else if (m_CombatTimer != null)
{
m_CombatTimer.Priority = TimerPriority.EveryTick;
}
UpdateRegion();
UpdateResistances();
@ -9375,7 +9356,6 @@ namespace Server
public ManaTimer(Mobile m)
: base(GetManaRegenRate(m), GetManaRegenRate(m))
{
Priority = TimerPriority.FiftyMS;
m_Owner = m;
}
@ -9397,7 +9377,6 @@ namespace Server
public HitsTimer(Mobile m)
: base(GetHitsRegenRate(m), GetHitsRegenRate(m))
{
Priority = TimerPriority.FiftyMS;
m_Owner = m;
}
@ -9419,7 +9398,6 @@ namespace Server
public StamTimer(Mobile m)
: base(GetStamRegenRate(m), GetStamRegenRate(m))
{
Priority = TimerPriority.FiftyMS;
m_Owner = m;
}
@ -9451,16 +9429,9 @@ namespace Server
{
private readonly Mobile m_Mobile;
public CombatTimer(Mobile m) : base(TimeSpan.FromSeconds(0.0), TimeSpan.FromSeconds(0.01))
{
public CombatTimer(Mobile m) : base(TimeSpan.FromSeconds(0.0), TimeSpan.FromSeconds(0.01)) =>
m_Mobile = m;
if (!m_Mobile.m_Player && m_Mobile.m_Dex <= 100)
{
Priority = TimerPriority.FiftyMS;
}
}
protected override void OnTick()
{
if (Core.TickCount - m_Mobile.NextCombatTime < 0)

3
Projects/Server/Server.csproj
View file

@ -39,9 +39,6 @@
</Target>
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.0.2" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Zlib.Bindings" Version="1.5.0" />
</ItemGroup>
<ItemGroup>

17
Projects/Server/Targeting/Target.cs
View file

@ -262,23 +262,6 @@ namespace Server.Targeting
{
m_Target = target;
m_Mobile = m;
if (delay >= ThirtySeconds)
{
Priority = TimerPriority.FiveSeconds;
}
else if (delay >= TenSeconds)
{
Priority = TimerPriority.OneSecond;
}
else if (delay >= OneSecond)
{
Priority = TimerPriority.TwoFiftyMS;
}
else
{
Priority = TimerPriority.TwentyFiveMS;
}
}
protected override void OnTick()

36
Projects/Server/Timer/Timer.DelayCall.cs
View file

@ -29,6 +29,9 @@ namespace Server
public partial class Timer
{
private static string FormatDelegate(Delegate callback) =>
callback == null ? "null" : $"{callback.Method.DeclaringType?.FullName ?? ""}.{callback.Method.Name}";
public static Timer DelayCall(TimerCallback callback) => DelayCall(TimeSpan.Zero, TimeSpan.Zero, 1, callback);
public static Timer DelayCall(TimeSpan delay, TimerCallback callback) =>
@ -40,8 +43,6 @@ namespace Server
public static Timer DelayCall(TimeSpan delay, TimeSpan interval, int count, TimerCallback callback)
{
Timer t = new DelayCallTimer(delay, interval, count, callback);
t.Priority = ComputePriority(count == 1 ? delay : interval);
t.Start();
return t;
@ -62,9 +63,6 @@ namespace Server
)
{
Timer t = new DelayStateCallTimer<T>(delay, interval, count, callback, state);
t.Priority = ComputePriority(count == 1 ? delay : interval);
t.Start();
return t;
@ -87,9 +85,6 @@ namespace Server
)
{
Timer t = new DelayStateCallTimer<T1, T2>(delay, interval, count, callback, t1, t2);
t.Priority = ComputePriority(count == 1 ? delay : interval);
t.Start();
return t;
@ -114,9 +109,6 @@ namespace Server
)
{
Timer t = new DelayStateCallTimer<T1, T2, T3>(delay, interval, count, callback, t1, t2, t3);
t.Priority = ComputePriority(count == 1 ? delay : interval);
t.Start();
return t;
@ -144,9 +136,6 @@ namespace Server
)
{
Timer t = new DelayStateCallTimer<T1, T2, T3, T4>(delay, interval, count, callback, t1, t2, t3, t4);
t.Priority = ComputePriority(count == 1 ? delay : interval);
t.Start();
return t;
@ -161,13 +150,10 @@ namespace Server
)
{
Callback = callback;
RegCreation();
}
public TimerCallback Callback { get; }
public override bool DefRegCreation => false;
protected override void OnTick()
{
Callback?.Invoke();
@ -185,14 +171,10 @@ namespace Server
{
Callback = callback;
m_State = state;
RegCreation();
}
public TimerStateCallback<T> Callback { get; }
public override bool DefRegCreation => false;
protected override void OnTick()
{
Callback?.Invoke(m_State);
@ -214,14 +196,10 @@ namespace Server
Callback = callback;
m_T1 = t1;
m_T2 = t2;
RegCreation();
}
public TimerStateCallback<T1, T2> Callback { get; }
public override bool DefRegCreation => false;
protected override void OnTick()
{
Callback?.Invoke(m_T1, m_T2);
@ -245,14 +223,10 @@ namespace Server
m_T1 = t1;
m_T2 = t2;
m_T3 = t3;
RegCreation();
}
public TimerStateCallback<T1, T2, T3> Callback { get; }
public override bool DefRegCreation => false;
protected override void OnTick()
{
Callback?.Invoke(m_T1, m_T2, m_T3);
@ -278,14 +252,10 @@ namespace Server
m_T2 = t2;
m_T3 = t3;
m_T4 = t4;
RegCreation();
}
public TimerStateCallback<T1, T2, T3, T4> Callback { get; }
public override bool DefRegCreation => false;
protected override void OnTick()
{
Callback?.Invoke(m_T1, m_T2, m_T3, m_T4);

263
Projects/Server/Timer/Timer.TimerWheel.cs Normal file
View file

@ -0,0 +1,263 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2021 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: Timer.TimerWheel.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace Server
{
public partial class Timer
{
private const int _ringSizePowerOf2 = 12;
private const int _ringSize = 1 << _ringSizePowerOf2; // 4096
private const int _ringLayers = 3;
private const int _tickRatePowerOf2 = 3;
private const int _tickRate = 1 << _tickRatePowerOf2; // 8ms
private static long _lastTickTurned = -1;
private static readonly Timer[][] _rings = new Timer[_ringLayers][];
private static readonly int[] _ringIndexes = new int[_ringLayers];
public static void Initialize(long tickCount)
{
_lastTickTurned = tickCount;
for (int i = 0; i < _rings.Length; i++)
{
_rings[i] = new Timer[_ringSize];
_ringIndexes[i] = 0;
}
}
public static int Slice(long tickCount)
{
var deltaSinceTurn = tickCount - _lastTickTurned;
var events = 0;
while (deltaSinceTurn >= _tickRate)
{
deltaSinceTurn -= _tickRate;
_lastTickTurned += _tickRate;
events += Turn() ? 1 : 0;
}
return events;
}
private static bool Turn()
{
bool events = false;
for (var i = 0; i < _ringLayers; i++)
{
// Increment the ring index, then get the timer.
var ringIndex = ++_ringIndexes[i];
bool turnNextWheel = ringIndex >= _ringSize;
if (turnNextWheel)
{
ringIndex = _ringIndexes[i] = 0;
}
var timer = _rings[i][ringIndex];
if (timer != null)
{
events = true;
if (i > 0 && timer._remaining > 0)
{
Promote(timer);
}
else
{
Execute(timer);
}
// Clear the slot
_rings[i][ringIndex] = null;
}
if (!turnNextWheel)
{
break;
}
}
return events;
}
private static void Execute(Timer timer)
{
do
{
var next = timer._nextTimer;
var prof = timer.GetProfile();
prof?.Start();
timer.OnTick();
prof?.Finish();
if (timer.Running)
{
RemoveTimer(timer);
if (timer.Count == 0 || ++timer.Index < timer.Count)
{
timer.Delay = timer.Interval;
timer.Next = Core.Now + timer.Interval;
AddTimer(timer, (long)timer.Delay.TotalMilliseconds);
}
}
timer = next;
} while (timer != null);
}
private static void Promote(Timer timer)
{
do
{
var next = timer._nextTimer;
RemoveTimer(timer);
AddTimer(timer, timer._remaining);
timer = next;
} while (timer != null);
}
private static void AddTimer(Timer timer, long delay)
{
delay = Math.Max(0, delay);
var resolutionPowerOf2 = _tickRatePowerOf2;
for (var i = 0; i < _ringLayers; i++)
{
var resolution = 1 << resolutionPowerOf2;
var nextResolutionPowerOf2 = resolutionPowerOf2 + _ringSizePowerOf2;
long max = 1 << nextResolutionPowerOf2;
if (delay < max)
{
var remaining = delay & (resolution - 1);
var slot = (delay >> resolutionPowerOf2) + _ringIndexes[i] + (remaining > 0 ? 1 : 0);
// Round up if we have a delay of 0
if (delay == 0)
{
slot++;
remaining = 0;
}
if (slot >= _ringSize)
{
slot -= _ringSize;
}
timer._nextTimer = _rings[i][slot];
if (timer._nextTimer != null)
{
timer._nextTimer._prevTimer = timer;
}
timer._remaining = remaining;
timer._ring = i;
timer._slot = (int)slot;
_rings[i][slot] = timer;
break;
}
// The remaining amount until we turn this ring
delay -= resolution * (_ringSize - _ringIndexes[i]);
resolutionPowerOf2 = nextResolutionPowerOf2;
}
}
private static void RemoveTimer(Timer timer)
{
if (timer._prevTimer != null)
{
timer._prevTimer._nextTimer = timer._nextTimer;
}
else
{
_rings[timer._ring][timer._slot] = timer._nextTimer;
}
if (timer._nextTimer != null)
{
timer._nextTimer._prevTimer = timer._prevTimer;
}
timer._nextTimer = null;
timer._prevTimer = null;
}
public static void DumpInfo(TextWriter tw)
{
var now = DateTime.UtcNow;
tw.WriteLine("Date: {0}", now);
tw.WriteLine();
var total = 0.0;
var hash = new Dictionary<string, int>();
for (var i = 0; i < _ringLayers; i++)
{
for (var j = 0; j < _ringSize; j++)
{
var t = _rings[i][j];
var name = t.ToString();
hash.TryGetValue(name, out var count);
hash[name] = count + 1;
total++;
}
}
foreach (var (name, count) in hash.OrderByDescending(o => o.Value))
{
tw.WriteLine($"Type: {name}; Count: {count}; Percent: {count / total}%");
}
tw.WriteLine();
tw.WriteLine();
}
public static void ClearAllTimers(long tickCount)
{
_lastTickTurned = tickCount;
foreach (var t in _rings)
{
for (var i = 0; i < _ringSize; i++)
{
var node = t[i];
Timer next;
do
{
next = node?._nextTimer;
node?.Stop();
} while (next != null);
}
}
}
}
}

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

@ -14,39 +14,19 @@
*************************************************************************/
using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using Server.Diagnostics;
namespace Server
{
public enum TimerPriority
{
EveryTick,
TenMS,
TwentyFiveMS,
FiftyMS,
TwoFiftyMS,
OneSecond,
FiveSeconds,
OneMinute
}
public partial class Timer
{
private static readonly Queue<Timer> m_Queue = new();
// We need to know what ring/slot we are in so we can be removed if we are "head" of the link list.
private int _ring;
private int _slot;
private static int m_QueueCountAtSlice;
private long m_Delay;
private long m_Interval;
private List<Timer> m_List;
private long m_Next;
private TimerPriority m_Priority;
private bool m_PrioritySet;
private bool m_Queued;
private bool m_Running;
private long _remaining;
private Timer _nextTimer;
private Timer _prevTimer;
public Timer(TimeSpan delay) : this(delay, TimeSpan.Zero, 1)
{
@ -54,130 +34,13 @@ namespace Server
public Timer(TimeSpan delay, TimeSpan interval, int count = 0)
{
m_Delay = (long)delay.TotalMilliseconds;
m_Interval = (long)interval.TotalMilliseconds;
Delay = delay;
Interval = interval;
Count = count;
_nextTimer = null;
_prevTimer = null;
Next = Core.Now + Delay;
if (!m_PrioritySet)
{
m_Priority = ComputePriority(count == 1 ? delay : interval);
m_PrioritySet = true;
}
if (DefRegCreation)
{
RegCreation();
}
}
public TimerPriority Priority
{
get => m_Priority;
set
{
if (!m_PrioritySet)
{
m_PrioritySet = true;
}
if (m_Priority != value)
{
m_Priority = value;
if (m_Running)
{
TimerThread.PriorityChange(this, (int)m_Priority);
}
}
}
}
public DateTime Next => DateTime.UtcNow + TimeSpan.FromMilliseconds(m_Next - Core.TickCount);
public TimeSpan Delay
{
get => TimeSpan.FromMilliseconds(m_Delay);
set => m_Delay = (long)value.TotalMilliseconds;
}
public TimeSpan Interval
{
get => TimeSpan.FromMilliseconds(m_Interval);
set => m_Interval = (long)value.TotalMilliseconds;
}
public int Index { get; private set; }
public int Count { get; }
public bool Running
{
get => m_Running;
set
{
if (value)
{
Start();
}
else
{
Stop();
}
}
}
public static int BreakCount { get; set; } = 20000;
public virtual bool DefRegCreation => true;
private static string FormatDelegate(Delegate callback) =>
callback == null ? "null" : $"{callback.Method.DeclaringType?.FullName ?? ""}.{callback.Method.Name}";
public static void DumpInfo(TextWriter tw)
{
TimerThread.DumpInfo(tw);
}
public TimerProfile GetProfile()
{
if (!Core.Profiling)
{
return null;
}
var name = ToString();
return TimerProfile.Acquire(name);
}
public static int Slice()
{
var index = 0;
lock (m_Queue)
{
m_QueueCountAtSlice = m_Queue.Count;
while (index < BreakCount && m_Queue.Count != 0)
{
var t = m_Queue.Dequeue();
var prof = t.GetProfile();
prof?.Start();
t.OnTick();
t.m_Queued = false;
index++;
prof?.Finish();
}
}
return index;
}
public void RegCreation()
{
var prof = GetProfile();
if (prof != null)
@ -186,321 +49,59 @@ namespace Server
}
}
public override string ToString() => GetType().FullName ?? "";
public DateTime Next { get; private set; }
public TimeSpan Delay { get; set; }
public TimeSpan Interval { get; set; }
public int Index { get; private set; }
public int Count { get; }
public bool Running { get; private set; }
public static TimerPriority ComputePriority(TimeSpan ts)
public TimerProfile GetProfile() => !Core.Profiling ? null : TimerProfile.Acquire(ToString() ?? "null");
public override string ToString() => GetType().FullName;
public Timer Start()
{
if (ts >= TimeSpan.FromMinutes(1.0))
if (Running)
{
return TimerPriority.FiveSeconds;
return this;
}
if (ts >= TimeSpan.FromSeconds(10.0))
Running = true;
AddTimer(this, (long)Delay.TotalMilliseconds);
var prof = GetProfile();
if (prof != null)
{
return TimerPriority.OneSecond;
prof.Started++;
}
if (ts >= TimeSpan.FromSeconds(5.0))
{
return TimerPriority.TwoFiftyMS;
}
if (ts >= TimeSpan.FromSeconds(2.5))
{
return TimerPriority.FiftyMS;
}
if (ts >= TimeSpan.FromSeconds(1.0))
{
return TimerPriority.TwentyFiveMS;
}
if (ts >= TimeSpan.FromSeconds(0.5))
{
return TimerPriority.TenMS;
}
return TimerPriority.EveryTick;
return this;
}
public void Start()
public Timer Stop()
{
if (!m_Running)
if (!Running)
{
m_Running = true;
TimerThread.AddTimer(this);
var prof = GetProfile();
if (prof != null)
{
prof.Started++;
}
return this;
}
}
public void Stop()
{
if (m_Running)
Running = false;
RemoveTimer(this);
var prof = GetProfile();
if (prof != null)
{
m_Running = false;
TimerThread.RemoveTimer(this);
var prof = GetProfile();
if (prof != null)
{
prof.Stopped++;
}
prof.Stopped++;
}
return this;
}
protected virtual void OnTick()
{
}
public class TimerThread
{
private static readonly Dictionary<Timer, TimerChangeEntry>
m_Changed = new();
private static readonly long[] m_NextPriorities = new long[8];
private static readonly long[] m_PriorityDelays =
{
0,
10,
25,
50,
250,
1000,
5000,
60000
};
private static readonly List<Timer>[] m_Timers =
{
new(),
new(),
new(),
new(),
new(),
new(),
new(),
new()
};
private static readonly AutoResetEvent m_Signal = new(false);
public static void DumpInfo(TextWriter tw)
{
for (var i = 0; i < 8; ++i)
{
tw.WriteLine("Priority: {0}", (TimerPriority)i);
tw.WriteLine();
var hash = new Dictionary<string, List<Timer>>();
for (var j = 0; j < m_Timers[i].Count; ++j)
{
var t = m_Timers[i][j];
var key = t.ToString();
if (!hash.TryGetValue(key, out var list))
{
hash[key] = list = new List<Timer>();
}
list.Add(t);
}
foreach (var kv in hash)
{
var key = kv.Key;
var list = kv.Value;
tw.WriteLine(
"Type: {0}; Count: {1}; Percent: {2}%",
key,
list.Count,
(int)(100 * (list.Count / (double)m_Timers[i].Count))
);
}
tw.WriteLine();
tw.WriteLine();
}
}
public static void Change(Timer t, int newIndex, bool isAdd)
{
lock (m_Changed)
{
m_Changed[t] = TimerChangeEntry.GetInstance(t, newIndex, isAdd);
}
m_Signal.Set();
}
public static void AddTimer(Timer t)
{
Change(t, (int)t.Priority, true);
}
public static void PriorityChange(Timer t, int newPrio)
{
Change(t, newPrio, false);
}
public static void RemoveTimer(Timer t)
{
Change(t, -1, false);
}
private static void ProcessChanged()
{
lock (m_Changed)
{
var curTicks = Core.TickCount;
foreach (var tce in m_Changed.Values)
{
var timer = tce.m_Timer;
var newIndex = tce.m_NewIndex;
timer.m_List?.Remove(timer);
if (tce.m_IsAdd)
{
timer.m_Next = curTicks + timer.m_Delay;
timer.Index = 0;
}
if (newIndex >= 0)
{
timer.m_List = m_Timers[newIndex];
timer.m_List.Add(timer);
}
else
{
timer.m_List = null;
}
tce.Free();
}
m_Changed.Clear();
}
}
public static void Set()
{
m_Signal.Set();
}
public void TimerMain()
{
while (!Core.Closing)
{
if (World.Loading || World.Saving)
{
m_Signal.WaitOne(1, false);
continue;
}
ProcessChanged();
for (var i = 0; i < m_Timers.Length; i++)
{
var now = Core.TickCount;
if (now < m_NextPriorities[i])
{
break;
}
m_NextPriorities[i] = now + m_PriorityDelays[i];
for (var j = 0; j < m_Timers[i].Count; j++)
{
var t = m_Timers[i][j];
if (!t.m_Queued && now > t.m_Next)
{
t.m_Queued = true;
lock (m_Queue)
{
m_Queue.Enqueue(t);
}
if (t.Count != 0 && ++t.Index >= t.Count)
{
t.Stop();
}
else
{
t.m_Next = now + t.m_Interval;
}
}
}
}
m_Signal.WaitOne(1, false);
}
}
private class TimerChangeEntry
{
private static readonly Queue<TimerChangeEntry> m_InstancePool = new();
public bool m_IsAdd;
public int m_NewIndex;
public Timer m_Timer;
private TimerChangeEntry(Timer t, int newIndex, bool isAdd)
{
m_Timer = t;
m_NewIndex = newIndex;
m_IsAdd = isAdd;
}
public void Free()
{
lock (m_InstancePool)
{
if (m_InstancePool.Count < 200) // Arbitrary
{
m_InstancePool.Enqueue(this);
}
}
}
public static TimerChangeEntry GetInstance(Timer t, int newIndex, bool isAdd)
{
TimerChangeEntry e = null;
lock (m_InstancePool)
{
if (m_InstancePool.Count > 0)
{
e = m_InstancePool.Dequeue();
}
}
if (e != null)
{
e.m_Timer = t;
e.m_NewIndex = newIndex;
e.m_IsAdd = isAdd;
}
else
{
e = new TimerChangeEntry(t, newIndex, isAdd);
}
return e;
}
}
}
}
}

2
Projects/UOContent/Accounting/Account.cs
View file

@ -1203,8 +1203,6 @@ namespace Server.Accounting
: base(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.0))
{
m_Account = account;
Priority = TimerPriority.FiveSeconds;
}
protected override void OnTick()

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()
{

1
Projects/UOContent/Items/Addons/ElvenSpinningwheelEastAddon.cs
View file

@ -101,7 +101,6 @@ namespace Server.Items
m_Callback = callback;
m_From = from;
m_Hue = hue;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Addons/ElvenSpinningwheelSouthAddon.cs
View file

@ -103,7 +103,6 @@ namespace Server.Items
m_Callback = callback;
m_From = from;
m_Hue = hue;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Addons/PickpocketDips.cs
View file

@ -142,7 +142,6 @@ namespace Server.Items
public InternalTimer(PickpocketDip dip) : base(TimeSpan.FromSeconds(3.0))
{
m_Dip = dip;
Priority = TimerPriority.FiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Addons/SpinningwheelEastAddon.cs
View file

@ -111,7 +111,6 @@ namespace Server.Items
m_Callback = callback;
m_From = from;
m_Hue = hue;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Addons/SpinningwheelSouthAddon.cs
View file

@ -103,7 +103,6 @@ namespace Server.Items
m_Callback = callback;
m_From = from;
m_Hue = hue;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Addons/TrainingDummies.cs
View file

@ -144,7 +144,6 @@ namespace Server.Items
public InternalTimer(TrainingDummy dummy) : base(TimeSpan.FromSeconds(0.25), TimeSpan.FromSeconds(2.75))
{
m_Dummy = dummy;
Priority = TimerPriority.FiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Clothing/OuterTorso.cs
View file

@ -201,7 +201,6 @@ namespace Server.Items
public InternalTimer(DeathRobe c, TimeSpan delay) : base(delay)
{
m_Robe = c;
Priority = TimerPriority.FiveSeconds;
}
protected override void OnTick()

1
Projects/UOContent/Items/Construction/Doors/BaseDoor.cs
View file

@ -563,7 +563,6 @@ namespace Server.Items
public InternalTimer(BaseDoor door) : base(TimeSpan.FromSeconds(20.0), TimeSpan.FromSeconds(10.0))
{
Priority = TimerPriority.OneSecond;
m_Door = door;
}

1
Projects/UOContent/Items/Containers/BaseTreasureChest.cs
View file

@ -203,7 +203,6 @@ namespace Server.Items
)
{
m_Chest = chest;
Priority = TimerPriority.OneMinute;
}
protected override void OnTick()

1
Projects/UOContent/Items/Containers/FurnitureContainer.cs
View file

@ -369,7 +369,6 @@ namespace Server.Items
public FurnitureTimer(Container c, Mobile m) : base(TimeSpan.FromSeconds(0.5), TimeSpan.FromSeconds(0.5))
{
Priority = TimerPriority.TwoFiftyMS;
m_Container = c;
m_Mobile = m;

1
Projects/UOContent/Items/Containers/TreasureMapChest.cs
View file

@ -588,7 +588,6 @@ namespace Server.Items
public DeleteTimer(Item item, DateTime time) : base(time - Core.Now)
{
m_Item = item;
Priority = TimerPriority.OneMinute;
}
protected override void OnTick()

2
Projects/UOContent/Items/Deeds/VendorRentalContract.cs
View file

@ -355,8 +355,6 @@ namespace Server.Items
public OfferExpireTimer(VendorRentalContract contract) : base(TimeSpan.FromSeconds(30.0))
{
m_Contract = contract;
Priority = TimerPriority.OneSecond;
}
protected override void OnTick()

2
Projects/UOContent/Items/Food/Beverage.cs
View file

@ -1186,8 +1186,6 @@ namespace Server.Items
: base(TimeSpan.FromSeconds(5.0), TimeSpan.FromSeconds(5.0))
{
m_Drunk = drunk;
Priority = TimerPriority.OneSecond;
}
protected override void OnTick()

1
Projects/UOContent/Items/Lights/BaseLight.cs
View file

@ -220,7 +220,6 @@ namespace Server.Items
public InternalTimer(BaseLight light, TimeSpan delay) : base(delay)
{
m_Light = light;
Priority = TimerPriority.FiveSeconds;
}
protected override void OnTick()

4
Projects/UOContent/Items/Maps/TreasureMap.cs
View file

@ -791,8 +791,6 @@ namespace Server.Items
m_NextSpellTime = from.NextSpellTime;
m_NextActionTime = from.NextActionTime;
m_LastMoveTime = from.LastMoveTime;
Priority = TimerPriority.TenMS;
}
private void Terminate()
@ -932,8 +930,6 @@ namespace Server.Items
{
m_From = from;
m_SoundID = soundID;
Priority = TimerPriority.TenMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Misc/Blood.cs
View file

@ -42,7 +42,6 @@ namespace Server.Items
public InternalTimer(Item blood) : base(TimeSpan.FromSeconds(5.0))
{
Priority = TimerPriority.OneSecond;
m_Blood = blood;
}

1
Projects/UOContent/Items/Misc/Corpses/Corpse.cs
View file

@ -1226,7 +1226,6 @@ namespace Server.Items
public InternalTimer(Corpse c, TimeSpan delay) : base(delay)
{
m_Corpse = c;
Priority = TimerPriority.FiveSeconds;
}
protected override void OnTick()

1
Projects/UOContent/Items/Misc/Corpses/DecayedCorpse.cs
View file

@ -100,7 +100,6 @@ namespace Server.Items
public InternalTimer(DecayedCorpse c, TimeSpan delay) : base(delay)
{
m_Corpse = c;
Priority = TimerPriority.FiveSeconds;
}
protected override void OnTick()

1
Projects/UOContent/Items/Misc/EffectItem.cs
View file

@ -78,7 +78,6 @@ namespace Server.Items
public FreeTimer(EffectItem item, TimeSpan delay) : base(delay)
{
m_Item = item;
Priority = TimerPriority.OneSecond;
}
protected override void OnTick()

1
Projects/UOContent/Items/Misc/MoonstoneGate.cs
View file

@ -79,7 +79,6 @@ namespace Server.Items
public InternalTimer(Item item) : base(TimeSpan.FromSeconds(30.0))
{
m_Item = item;
Priority = TimerPriority.OneSecond;
}
protected override void OnTick()

2
Projects/UOContent/Items/Misc/PowerGenerator.cs
View file

@ -550,8 +550,6 @@ namespace Server.Items
m_Panel = panel;
m_To = to;
m_Step = 0;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Misc/TrashBarrel.cs
View file

@ -148,7 +148,6 @@ namespace Server.Items
public EmptyTimer(TrashBarrel barrel) : base(TimeSpan.FromMinutes(3.0))
{
m_Barrel = barrel;
Priority = TimerPriority.FiveSeconds;
}
protected override void OnTick()

1
Projects/UOContent/Items/Misc/UnholyBone.cs
View file

@ -83,7 +83,6 @@ namespace Server.Items
public SpawnTimer(Item item) : base(TimeSpan.FromSeconds(Utility.RandomMinMax(5, 10)))
{
Priority = TimerPriority.FiftyMS;
m_Item = item;
}

2
Projects/UOContent/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -281,8 +281,6 @@ namespace Server.Items
{
m_Item = item;
m_End = end;
Priority = TimerPriority.FiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Skill Items/Misc/Bandage.cs
View file

@ -566,7 +566,6 @@ namespace Server.Items
public InternalTimer(BandageContext context, TimeSpan delay) : base(delay)
{
m_Context = context;
Priority = TimerPriority.FiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -609,7 +609,6 @@ namespace Server.Items
public InternalTimer(Mobile from) : base(TimeSpan.FromSeconds(6.0))
{
m_From = from;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Skill Items/Thief/DisguiseKit.cs
View file

@ -337,7 +337,6 @@ namespace Server.Items
public InternalTimer(Mobile m, TimeSpan delay) : base(delay)
{
m_Player = m;
Priority = TimerPriority.OneMinute;
}
protected override void OnTick()

1
Projects/UOContent/Items/Skill Items/Thief/LockPick.cs
View file

@ -100,7 +100,6 @@ namespace Server.Items
m_From = from;
m_Item = item;
m_Lockpick = lockpick;
Priority = TimerPriority.TwoFiftyMS;
}
protected void BrokeLockPickTest()

2
Projects/UOContent/Items/Special/Evil Home Decor Collection/AwesomeDisturbingPortrait.cs
View file

@ -145,8 +145,6 @@ namespace Server.Items
)
{
m_Component = c;
Priority = TimerPriority.OneMinute;
}
protected override void OnTick()

2
Projects/UOContent/Items/Special/Gifts/RoseOfTrinsic.cs
View file

@ -145,8 +145,6 @@ namespace Server.Items
public SpawnTimer(RoseOfTrinsic rose, TimeSpan delay) : base(delay)
{
m_Rose = rose;
Priority = TimerPriority.OneMinute;
}
protected override void OnTick()

1
Projects/UOContent/Items/Special/Holiday/HolidayFoods.cs
View file

@ -67,7 +67,6 @@ namespace Server.Items
: base(TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30))
{
Eater = eater;
Priority = TimerPriority.FiveSeconds;
Start();
}

1
Projects/UOContent/Items/Weapons/Abilities/BleedAttack.cs
View file

@ -115,7 +115,6 @@ namespace Server.Items
{
m_From = from;
m_Mobile = m;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Weapons/Abilities/Block.cs
View file

@ -80,7 +80,6 @@ namespace Server.Items
{
m_Bonus = bonus;
m_Mobile = m;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Weapons/Abilities/DualWield.cs
View file

@ -60,7 +60,6 @@ namespace Server.Items
{
m_Owner = owner;
BonusSwingSpeed = bonusSwingSpeed;
Priority = TimerPriority.FiftyMS;
}
public int BonusSwingSpeed { get; }

1
Projects/UOContent/Items/Weapons/Abilities/Feint.cs
View file

@ -65,7 +65,6 @@ namespace Server.Items
{
m_Defender = defender;
SwingSpeedReduction = swingSpeedReduction;
Priority = TimerPriority.FiftyMS;
}
public int SwingSpeedReduction { get; }

2
Projects/UOContent/Items/Weapons/Abilities/FrenziedWhirlwind.cs
View file

@ -110,8 +110,6 @@ namespace Server.Items
m_DamageRemaining = totalDamage;
DamagePerTick = (double)totalDamage / 12 + 0.01;
Priority = TimerPriority.TwentyFiveMS;
}
protected override void OnTick()

1
Projects/UOContent/Items/Weapons/Abilities/TalonStrike.cs
View file

@ -65,7 +65,6 @@ namespace Server.Items
{
m_Defender = defender;
m_DamageRemaining = totalDamage;
Priority = TimerPriority.TwentyFiveMS;
DamagePerTick = (double)totalDamage / 12 + .01;
}

2
Projects/UOContent/Items/Weapons/Abilities/WeaponAbility.cs
View file

@ -446,8 +446,6 @@ namespace Server.Items
public WeaponAbilityTimer(Mobile from) : base(TimeSpan.FromSeconds(3.0))
{
m_Mobile = from;
Priority = TimerPriority.TwentyFiveMS;
}
protected override void OnTick()

2
Projects/UOContent/Items/Weapons/Fists.cs
View file

@ -294,8 +294,6 @@ namespace Server.Items
{
m_Mobile = m;
Priority = TimerPriority.TwoFiftyMS;
m_Mobile.BeginAction<Fists>();
}

2
Projects/UOContent/Items/Weapons/HitLower.cs
View file

@ -62,7 +62,6 @@ namespace Server.Items
public AttackTimer(Mobile player) : base(AttackEffectDuration)
{
m_Player = player;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()
@ -78,7 +77,6 @@ namespace Server.Items
public DefenseTimer(Mobile player) : base(DefenseEffectDuration)
{
m_Player = player;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

30
Projects/UOContent/Misc/AutoRestart.cs
View file

@ -4,7 +4,28 @@ namespace Server.Misc
{
public class AutoRestart : Timer
{
public static bool Enabled; // is the script enabled?
private static Timer _autoRestart;
private static bool _enabled;
public static bool Enabled
{
get => _enabled;
set
{
if (value)
{
_enabled = true;
_autoRestart ??= new AutoRestart();
_autoRestart.Start();
}
else
{
_enabled = false;
_autoRestart?.Stop();
_autoRestart = null;
}
}
}
private static readonly TimeSpan RestartTime = TimeSpan.FromHours(2.0); // time of day at which to restart
@ -19,7 +40,6 @@ namespace Server.Misc
public AutoRestart() : base(TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(1.0))
{
Priority = TimerPriority.FiveSeconds;
m_RestartTime = DateTime.UtcNow.Date + RestartTime;
@ -31,10 +51,14 @@ namespace Server.Misc
public static bool Restarting { get; private set; }
public static void Configure()
{
Enabled = ServerConfiguration.GetOrUpdateSetting("world.enableAutoRestart", false);
}
public static void Initialize()
{
CommandSystem.Register("Restart", AccessLevel.Administrator, Restart_OnCommand);
new AutoRestart().Start();
}
public static void Restart_OnCommand(CommandEventArgs e)

4
Projects/UOContent/Misc/AutoSave.cs
View file

@ -12,7 +12,9 @@ namespace Server.Misc
public static TimeSpan Warning { get; private set; }
public static string BackupPath { get; private set; }
public AutoSave() : base(Delay - Warning, Delay) => Priority = TimerPriority.OneMinute;
public AutoSave() : base(Delay - Warning, Delay)
{
}
public static bool SavesEnabled { get; set; } = true;

5
Projects/UOContent/Misc/FoodDecay.cs
View file

@ -5,8 +5,9 @@ namespace Server.Misc
{
public class FoodDecayTimer : Timer
{
public FoodDecayTimer() : base(TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5)) =>
Priority = TimerPriority.OneMinute;
public FoodDecayTimer() : base(TimeSpan.FromMinutes(5), TimeSpan.FromMinutes(5))
{
}
public static void Initialize()
{

5
Projects/UOContent/Misc/Guild.cs
View file

@ -546,8 +546,9 @@ namespace Server.Guilds
public class WarTimer : Timer
{
public WarTimer() : base(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.0)) =>
Priority = TimerPriority.FiveSeconds;
public WarTimer() : base(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.0))
{
}
public static void Initialize()
{

6
Projects/UOContent/Misc/LightCycle.cs
View file

@ -92,8 +92,9 @@ namespace Server
private class LightCycleTimer : Timer
{
public LightCycleTimer() : base(TimeSpan.FromSeconds(0), TimeSpan.FromSeconds(5.0)) =>
Priority = TimerPriority.FiveSeconds;
public LightCycleTimer() : base(TimeSpan.FromSeconds(0), TimeSpan.FromSeconds(5.0))
{
}
protected override void OnTick()
{
@ -111,7 +112,6 @@ namespace Server
public NightSightTimer(Mobile owner) : base(TimeSpan.FromMinutes(Utility.Random(15, 25)))
{
m_Owner = owner;
Priority = TimerPriority.OneMinute;
}
protected override void OnTick()

6
Projects/UOContent/Misc/WebStatus.cs
View file

@ -19,9 +19,9 @@ namespace Server.Misc
private static readonly object _StatusLock = new();
public StatusPage()
: base(TimeSpan.FromSeconds(5.0), TimeSpan.FromSeconds(60.0)) =>
Priority = TimerPriority.FiveSeconds;
public StatusPage() : base(TimeSpan.FromSeconds(5.0), TimeSpan.FromSeconds(60.0))
{
}
public static void Initialize()
{

2
Projects/UOContent/Mobiles/AI/BaseAI.cs
View file

@ -3022,8 +3022,6 @@ namespace Server.Mobiles
m_Owner = owner;
m_Owner.m_NextDetectHidden = Core.TickCount;
Priority = TimerPriority.FiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Mobiles/Animals/Mounts/Hiryu.cs
View file

@ -262,7 +262,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_Mod = mod;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

5
Projects/UOContent/Mobiles/Animals/Mounts/LesserHiryu.cs
View file

@ -73,14 +73,14 @@ namespace Server.Mobiles
var rand = Utility.Random(527);
/*
500 527 No Hue Color 94.88% 0
10 527 Green 1.90% 0x8295
10 527 Green 1.90% 0x8163 (Very Close to Above Green) //this one is an approximation
5 527 Dark Green 0.95% 0x87D4
1 527 Valorite 0.19% 0x88AB
1 527 Midnight Blue 0.19% 0x8258
* */
if (rand <= 0)
@ -264,7 +264,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_Mod = mod;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

2
Projects/UOContent/Mobiles/BaseCreature.cs
View file

@ -5599,7 +5599,6 @@ namespace Server.Mobiles
public DeleteTimer(Mobile creature, TimeSpan delay) : base(delay)
{
m = creature;
Priority = TimerPriority.OneMinute;
}
protected override void OnTick()
@ -5618,7 +5617,6 @@ namespace Server.Mobiles
public LoyaltyTimer() : base(InternalDelay, InternalDelay)
{
m_NextHourlyCheck = Core.Now + TimeSpan.FromHours(1.0);
Priority = TimerPriority.FiveSeconds;
}
public static void Initialize()

1
Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/OrcBomber.cs
View file

@ -155,7 +155,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_From = from;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/ShadowFiend.cs
View file

@ -105,7 +105,6 @@ namespace Server.Mobiles
public UnhideTimer(ShadowFiend owner) : base(TimeSpan.FromSeconds(30.0))
{
m_Owner = owner;
Priority = TimerPriority.OneSecond;
}
protected override void OnTick()

5
Projects/UOContent/Mobiles/Monsters/ML/Bedlam/LadyJennifyr.cs
View file

@ -53,10 +53,10 @@ namespace Server.Mobiles
public override void OnDeath( Container c )
{
base.OnDeath( c );
if (Utility.RandomDouble() < 0.15)
c.DropItem( new DisintegratingThesisNotes() );
if (Utility.RandomDouble() < 0.1)
c.DropItem( new ParrotItem() );
}
@ -120,7 +120,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_Mod = mod;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

5
Projects/UOContent/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs
View file

@ -79,14 +79,13 @@ namespace Server.Mobiles
private Mobile m_From;
private Mobile m_Mobile;
private int m_Count;
public InternalTimer( Mobile from, Mobile m ) : base( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ) )
{
m_From = from;
m_Mobile = m;
Priority = TimerPriority.TwoFiftyMS;
}
}*/
}
}

5
Projects/UOContent/Mobiles/Monsters/ML/Twisted Weald/Swoop.cs
View file

@ -47,7 +47,7 @@ namespace Server.Mobiles
public override void OnDeath( Container c )
{
base.OnDeath( c );
if (Utility.RandomDouble() < 0.025)
{
switch ( Utility.Random( 18 ) )
@ -72,7 +72,7 @@ namespace Server.Mobiles
case 17: c.DropItem( new GreymistGloves() ); break;
}
}
if (Utility.RandomDouble() < 0.1)
c.DropItem( new ParrotItem() );
}
@ -153,7 +153,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_Mod = mod;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

1
Projects/UOContent/Mobiles/Monsters/Misc/Melee/SandVortex.cs
View file

@ -102,7 +102,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_From = from;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs
View file

@ -242,7 +242,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_From = from;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

1
Projects/UOContent/Mobiles/Monsters/SE/FanDancer.cs
View file

@ -175,7 +175,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_Mod = mod;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Mobiles/Monsters/SE/Kappa.cs
View file

@ -189,7 +189,6 @@ namespace Server.Mobiles
{
m_From = from;
m_Mobile = m;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

1
Projects/UOContent/Mobiles/Monsters/SE/KazeKemono.cs
View file

@ -157,7 +157,6 @@ namespace Server.Mobiles
m_Mobile = m;
m_Mod = mod;
m_Table = table;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

1
Projects/UOContent/Mobiles/Monsters/SE/LadyOfTheSnow.cs
View file

@ -131,7 +131,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_From = from;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

1
Projects/UOContent/Mobiles/Monsters/SE/RaiJu.cs
View file

@ -107,7 +107,6 @@ namespace Server.Mobiles
public ExpireTimer(Mobile m, TimeSpan delay) : base(delay)
{
m_Mobile = m;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

1
Projects/UOContent/Mobiles/Monsters/SE/RuneBeetle.cs
View file

@ -248,7 +248,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_Mods = mods;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

1
Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs
View file

@ -146,7 +146,6 @@ namespace Server.Mobiles
{
m_Mobile = m;
m_From = from;
Priority = TimerPriority.TwoFiftyMS;
}
public void DoExpire()

2
Projects/UOContent/Mobiles/Special/Barracoon.cs
View file

@ -236,8 +236,6 @@ namespace Server.Mobiles
public ExpirePolymorphTimer(Mobile owner) : base(TimeSpan.FromMinutes(3.0))
{
m_Owner = owner;
Priority = TimerPriority.OneSecond;
}
protected override void OnTick()

1
Projects/UOContent/Mobiles/Special/Dummy.cs
View file

@ -151,7 +151,6 @@ namespace Server.Mobiles
public AutokillTimer(Dummy owner) : base(TimeSpan.FromMinutes(5.0))
{
m_Owner = owner;
Priority = TimerPriority.FiveSeconds;
}
protected override void OnTick()

2
Projects/UOContent/Mobiles/Special/Harrower.cs
View file

@ -546,7 +546,6 @@ namespace Server.Mobiles
public TeleportTimer(Mobile owner) : base(TimeSpan.FromSeconds(5.0), TimeSpan.FromSeconds(5.0))
{
Priority = TimerPriority.TwoFiftyMS;
m_Owner = owner;
}
@ -643,7 +642,6 @@ namespace Server.Mobiles
public GoodiesTimer(Map map, int x, int y) : base(TimeSpan.FromSeconds(Utility.RandomDouble() * 10.0))
{
Priority = TimerPriority.TwoFiftyMS;
m_Map = map;
m_X = x;

1
Projects/UOContent/Mobiles/Special/HarrowerTentacles.cs
View file

@ -132,7 +132,6 @@ namespace Server.Mobiles
public DrainTimer(HarrowerTentacles owner) : base(TimeSpan.FromSeconds(5.0), TimeSpan.FromSeconds(5.0))
{
m_Owner = owner;
Priority = TimerPriority.TwoFiftyMS;
}
protected override void OnTick()

Some files were not shown because too many files have changed in this diff Show more