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

fix: Fixes pooled timer detach (#1115)

Browse source 
- [X] Fixes timers not returning on detach
This commit is contained in:
Kamron Batman 2022-07-14 11:14:37 -07:00 • committed by GitHub
parent 9c374861d9
commit a4168dc219
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 804 additions and 816 deletions
Download patch file Download diff file Expand all files Collapse all files

391
Projects/Server/Timer/Timer.DelayStateCall.cs
View file

@ -16,227 +16,226 @@
using System;
using System.Runtime.CompilerServices;
namespace Server
namespace Server;
public partial class Timer
{
public partial class Timer
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T>(Action<T> callback, T state) =>
DelayCall(TimeSpan.Zero, TimeSpan.Zero, 1, callback, state);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T>(TimeSpan delay, Action<T> callback, T state) =>
DelayCall(delay, TimeSpan.Zero, 1, callback, state);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T>(TimeSpan delay, TimeSpan interval, Action<T> callback, T state) =>
DelayCall(delay, interval, 0, callback, state);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T>(TimeSpan delay, TimeSpan interval, int count, Action<T> callback, T state) =>
new DelayStateCallTimer<T>(delay, interval, count, callback, state).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2>(Action<T1, T2> callback, T1 t1, T2 t2) =>
DelayCall(TimeSpan.Zero, TimeSpan.Zero, 1, callback, t1, t2);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2>(TimeSpan delay, Action<T1, T2> callback, T1 t1, T2 t2) =>
DelayCall(delay, TimeSpan.Zero, 1, callback, t1, t2);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2>(TimeSpan delay, TimeSpan interval, Action<T1, T2> callback, T1 t1, T2 t2) =>
DelayCall(delay, interval, 0, callback, t1, t2);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2>(
TimeSpan delay, TimeSpan interval, int count, Action<T1, T2> callback,
T1 t1, T2 t2
) => new DelayStateCallTimer<T1, T2>(delay, interval, count, callback, t1, t2).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3>(Action<T1, T2, T3> callback, T1 t1, T2 t2, T3 t3) =>
DelayCall(TimeSpan.Zero, TimeSpan.Zero, 1, callback, t1, t2, t3);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3>(
TimeSpan delay, Action<T1, T2, T3> callback, T1 t1, T2 t2, T3 t3
) => DelayCall(delay, TimeSpan.Zero, 1, callback, t1, t2, t3);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3>(
TimeSpan delay, TimeSpan interval, Action<T1, T2, T3> callback,
T1 t1, T2 t2, T3 t3
) => DelayCall(delay, interval, 0, callback, t1, t2, t3);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3>(
TimeSpan delay, TimeSpan interval, int count,
Action<T1, T2, T3> callback, T1 t1, T2 t2, T3 t3
) => new DelayStateCallTimer<T1, T2, T3>(delay, interval, count, callback, t1, t2, t3).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4>(
Action<T1, T2, T3, T4> callback, T1 t1, T2 t2, T3 t3, T4 t4
) => DelayCall(TimeSpan.Zero, TimeSpan.Zero, 1, callback, t1, t2, t3, t4);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4>(
TimeSpan delay, Action<T1, T2, T3, T4> callback,
T1 t1, T2 t2, T3 t3, T4 t4
) => DelayCall(delay, TimeSpan.Zero, 1, callback, t1, t2, t3, t4);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4>(
TimeSpan delay, TimeSpan interval,
Action<T1, T2, T3, T4> callback, T1 t1, T2 t2, T3 t3, T4 t4
) => DelayCall(delay, interval, 0, callback, t1, t2, t3, t4);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4>(
TimeSpan delay, TimeSpan interval, int count,
Action<T1, T2, T3, T4> callback, T1 t1, T2 t2, T3 t3, T4 t4
) => new DelayStateCallTimer<T1, T2, T3, T4>(delay, interval, count, callback, t1, t2, t3, t4).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4, T5>(
Action<T1, T2, T3, T4, T5> callback, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) => new DelayStateCallTimer<T1, T2, T3, T4, T5>(TimeSpan.Zero, TimeSpan.Zero, 1, callback, t1, t2, t3, t4, t5).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4, T5>(
TimeSpan delay,
Action<T1, T2, T3, T4, T5> callback, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) => new DelayStateCallTimer<T1, T2, T3, T4, T5>(delay, TimeSpan.Zero, 1, callback, t1, t2, t3, t4, t5).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4, T5>(
TimeSpan delay, TimeSpan interval,
Action<T1, T2, T3, T4, T5> callback, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) => new DelayStateCallTimer<T1, T2, T3, T4, T5>(delay, interval, 0, callback, t1, t2, t3, t4, t5).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4, T5>(
TimeSpan delay, TimeSpan interval, int count,
Action<T1, T2, T3, T4, T5> callback, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) => new DelayStateCallTimer<T1, T2, T3, T4, T5>(delay, interval, count, callback, t1, t2, t3, t4, t5).Start();
private class DelayStateCallTimer<T> : Timer
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T>(Action<T> callback, T state) =>
DelayCall(TimeSpan.Zero, TimeSpan.Zero, 1, callback, state);
private readonly T _t1;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T>(TimeSpan delay, Action<T> callback, T state) =>
DelayCall(delay, TimeSpan.Zero, 1, callback, state);
public DelayStateCallTimer(TimeSpan delay, TimeSpan interval, int count, Action<T> callback, T state)
: base(delay, interval, count)
{
Callback = callback;
_t1 = state;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T>(TimeSpan delay, TimeSpan interval, Action<T> callback, T state) =>
DelayCall(delay, interval, 0, callback, state);
public Action<T> Callback { get; }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T>(TimeSpan delay, TimeSpan interval, int count, Action<T> callback, T state) =>
new DelayStateCallTimer<T>(delay, interval, count, callback, state).Start();
protected override void OnTick() => Callback?.Invoke(_t1);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2>(Action<T1, T2> callback, T1 t1, T2 t2) =>
DelayCall(TimeSpan.Zero, TimeSpan.Zero, 1, callback, t1, t2);
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2>(TimeSpan delay, Action<T1, T2> callback, T1 t1, T2 t2) =>
DelayCall(delay, TimeSpan.Zero, 1, callback, t1, t2);
private class DelayStateCallTimer<T1, T2> : Timer
{
private readonly T1 _t1;
private readonly T2 _t2;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2>(TimeSpan delay, TimeSpan interval, Action<T1, T2> callback, T1 t1, T2 t2) =>
DelayCall(delay, interval, 0, callback, t1, t2);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2>(
public DelayStateCallTimer(
TimeSpan delay, TimeSpan interval, int count, Action<T1, T2> callback,
T1 t1, T2 t2
) => new DelayStateCallTimer<T1, T2>(delay, interval, count, callback, t1, t2).Start();
) : base(delay, interval, count)
{
Callback = callback;
_t1 = t1;
_t2 = t2;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3>(Action<T1, T2, T3> callback, T1 t1, T2 t2, T3 t3) =>
DelayCall(TimeSpan.Zero, TimeSpan.Zero, 1, callback, t1, t2, t3);
public Action<T1, T2> Callback { get; }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3>(
TimeSpan delay, Action<T1, T2, T3> callback, T1 t1, T2 t2, T3 t3
) => DelayCall(delay, TimeSpan.Zero, 1, callback, t1, t2, t3);
protected override void OnTick() => Callback?.Invoke(_t1, _t2);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3>(
TimeSpan delay, TimeSpan interval, Action<T1, T2, T3> callback,
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
}
private class DelayStateCallTimer<T1, T2, T3> : Timer
{
private readonly T1 _t1;
private readonly T2 _t2;
private readonly T3 _t3;
public DelayStateCallTimer(
TimeSpan delay, TimeSpan interval, int count, Action<T1, T2, T3> callback,
T1 t1, T2 t2, T3 t3
) => DelayCall(delay, interval, 0, callback, t1, t2, t3);
) : base(delay, interval, count)
{
Callback = callback;
_t1 = t1;
_t2 = t2;
_t3 = t3;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3>(
TimeSpan delay, TimeSpan interval, int count,
Action<T1, T2, T3> callback, T1 t1, T2 t2, T3 t3
) => new DelayStateCallTimer<T1, T2, T3>(delay, interval, count, callback, t1, t2, t3).Start();
public Action<T1, T2, T3> Callback { get; }
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4>(
Action<T1, T2, T3, T4> callback, T1 t1, T2 t2, T3 t3, T4 t4
) => DelayCall(TimeSpan.Zero, TimeSpan.Zero, 1, callback, t1, t2, t3, t4);
protected override void OnTick() => Callback?.Invoke(_t1, _t2, _t3);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4>(
TimeSpan delay, Action<T1, T2, T3, T4> callback,
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
}
private class DelayStateCallTimer<T1, T2, T3, T4> : Timer
{
private readonly T1 _t1;
private readonly T2 _t2;
private readonly T3 _t3;
private readonly T4 _t4;
public DelayStateCallTimer(
TimeSpan delay, TimeSpan interval, int count, Action<T1, T2, T3, T4> callback,
T1 t1, T2 t2, T3 t3, T4 t4
) => DelayCall(delay, TimeSpan.Zero, 1, callback, t1, t2, t3, t4);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4>(
TimeSpan delay, TimeSpan interval,
Action<T1, T2, T3, T4> callback, T1 t1, T2 t2, T3 t3, T4 t4
) => DelayCall(delay, interval, 0, callback, t1, t2, t3, t4);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4>(
TimeSpan delay, TimeSpan interval, int count,
Action<T1, T2, T3, T4> callback, T1 t1, T2 t2, T3 t3, T4 t4
) => new DelayStateCallTimer<T1, T2, T3, T4>(delay, interval, count, callback, t1, t2, t3, t4).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4, T5>(
Action<T1, T2, T3, T4, T5> callback, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) => new DelayStateCallTimer<T1, T2, T3, T4, T5>(TimeSpan.Zero, TimeSpan.Zero, 1, callback, t1, t2, t3, t4, t5).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4, T5>(
TimeSpan delay,
Action<T1, T2, T3, T4, T5> callback, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) => new DelayStateCallTimer<T1, T2, T3, T4, T5>(delay, TimeSpan.Zero, 1, callback, t1, t2, t3, t4, t5).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4, T5>(
TimeSpan delay, TimeSpan interval,
Action<T1, T2, T3, T4, T5> callback, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) => new DelayStateCallTimer<T1, T2, T3, T4, T5>(delay, interval, 0, callback, t1, t2, t3, t4, t5).Start();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Timer DelayCall<T1, T2, T3, T4, T5>(
TimeSpan delay, TimeSpan interval, int count,
Action<T1, T2, T3, T4, T5> callback, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) => new DelayStateCallTimer<T1, T2, T3, T4, T5>(delay, interval, count, callback, t1, t2, t3, t4, t5).Start();
private class DelayStateCallTimer<T> : Timer
) : base(delay, interval, count)
{
private readonly T _t1;
public DelayStateCallTimer(TimeSpan delay, TimeSpan interval, int count, Action<T> callback, T state)
: base(delay, interval, count)
{
Callback = callback;
_t1 = state;
}
public Action<T> Callback { get; }
protected override void OnTick() => Callback?.Invoke(_t1);
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
Callback = callback;
_t1 = t1;
_t2 = t2;
_t3 = t3;
_t4 = t4;
}
private class DelayStateCallTimer<T1, T2> : Timer
public Action<T1, T2, T3, T4> Callback { get; }
protected override void OnTick() => Callback?.Invoke(_t1, _t2, _t3, _t4);
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
}
private class DelayStateCallTimer<T1, T2, T3, T4, T5> : Timer
{
private readonly T1 _t1;
private readonly T2 _t2;
private readonly T3 _t3;
private readonly T4 _t4;
private readonly T5 _t5;
public DelayStateCallTimer(
TimeSpan delay, TimeSpan interval, int count, Action<T1, T2, T3, T4, T5> callback,
T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) : base(delay, interval, count)
{
private readonly T1 _t1;
private readonly T2 _t2;
public DelayStateCallTimer(
TimeSpan delay, TimeSpan interval, int count, Action<T1, T2> callback,
T1 t1, T2 t2
) : base(delay, interval, count)
{
Callback = callback;
_t1 = t1;
_t2 = t2;
}
public Action<T1, T2> Callback { get; }
protected override void OnTick() => Callback?.Invoke(_t1, _t2);
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
Callback = callback;
_t1 = t1;
_t2 = t2;
_t3 = t3;
_t4 = t4;
_t5 = t5;
}
private class DelayStateCallTimer<T1, T2, T3> : Timer
{
private readonly T1 _t1;
private readonly T2 _t2;
private readonly T3 _t3;
public Action<T1, T2, T3, T4, T5> Callback { get; }
public DelayStateCallTimer(
TimeSpan delay, TimeSpan interval, int count, Action<T1, T2, T3> callback,
T1 t1, T2 t2, T3 t3
) : base(delay, interval, count)
{
Callback = callback;
_t1 = t1;
_t2 = t2;
_t3 = t3;
}
protected override void OnTick() => Callback?.Invoke(_t1, _t2, _t3, _t4, _t5);
public Action<T1, T2, T3> Callback { get; }
protected override void OnTick() => Callback?.Invoke(_t1, _t2, _t3);
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
}
private class DelayStateCallTimer<T1, T2, T3, T4> : Timer
{
private readonly T1 _t1;
private readonly T2 _t2;
private readonly T3 _t3;
private readonly T4 _t4;
public DelayStateCallTimer(
TimeSpan delay, TimeSpan interval, int count, Action<T1, T2, T3, T4> callback,
T1 t1, T2 t2, T3 t3, T4 t4
) : base(delay, interval, count)
{
Callback = callback;
_t1 = t1;
_t2 = t2;
_t3 = t3;
_t4 = t4;
}
public Action<T1, T2, T3, T4> Callback { get; }
protected override void OnTick() => Callback?.Invoke(_t1, _t2, _t3, _t4);
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
}
private class DelayStateCallTimer<T1, T2, T3, T4, T5> : Timer
{
private readonly T1 _t1;
private readonly T2 _t2;
private readonly T3 _t3;
private readonly T4 _t4;
private readonly T5 _t5;
public DelayStateCallTimer(
TimeSpan delay, TimeSpan interval, int count, Action<T1, T2, T3, T4, T5> callback,
T1 t1, T2 t2, T3 t3, T4 t4, T5 t5
) : base(delay, interval, count)
{
Callback = callback;
_t1 = t1;
_t2 = t2;
_t3 = t3;
_t4 = t4;
_t5 = t5;
}
public Action<T1, T2, T3, T4, T5> Callback { get; }
protected override void OnTick() => Callback?.Invoke(_t1, _t2, _t3, _t4, _t5);
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
}
public override string ToString() => $"DelayStateCall[{FormatDelegate(Callback)}]";
}
}