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

fix(core): NPE in Cycles per second (#331)

Browse source 
- [X] Fixes an edge case where the cycle index goes negative and crashes
- [X] Fixes average CPS calculation
- [X] Fixes issue with logout delay
- [X] Bumps release version
This commit is contained in:
Kamron Batman 2020-11-30 23:12:16 -08:00 • committed by GitHub
parent b71c754738
commit 75c1b32513
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
88 changed files with 216 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Projects/Server/Main.cs
View file

@ -40,8 +40,8 @@ namespace Server
private static TimeSpan m_ProfileTime;
private static bool? m_IsRunningFromXUnit;
private static int m_CycleIndex = 1;
private static readonly float[] m_CyclesPerSecond = new float[100];
private static long m_CycleIndex;
private static readonly float[] m_CyclesPerSecond = new float[127]; // Divisible by long.MaxValue
// private static readonly AutoResetEvent m_Signal = new AutoResetEvent(true);
@ -137,9 +137,23 @@ namespace Server
public static bool Closing => ClosingTokenSource.IsCancellationRequested;
public static float CyclesPerSecond => m_CyclesPerSecond[(m_CycleIndex - 1) % m_CyclesPerSecond.Length];
public static float CyclesPerSecond => m_CyclesPerSecond[m_CycleIndex % m_CyclesPerSecond.Length];
public static float AverageCPS => m_CyclesPerSecond.Take(m_CycleIndex).Average();
public static float AverageCPS
{
get
{
var total = 0.0f;
var count = Math.Min(m_CycleIndex + 1, m_CyclesPerSecond.Length);
for (int i = 0; i < count; i++)
{
total += m_CyclesPerSecond[i];
}
return total / count;
}
}
public static string Arguments
{
@ -452,7 +466,7 @@ namespace Server
{
try
{
long last = TickCount;
long now, last = TickCount;
const int sampleInterval = 100;
const float ticksPerSecond = 1000.0f * sampleInterval;
@ -481,8 +495,9 @@ namespace Server
continue;
}
var now = TickCount;
m_CyclesPerSecond[m_CycleIndex++ % m_CyclesPerSecond.Length] = ticksPerSecond / (now - last);
now = TickCount;
m_CyclesPerSecond[m_CycleIndex % m_CyclesPerSecond.Length] = ticksPerSecond / (now - last);
m_CycleIndex = Math.Max(unchecked(m_CycleIndex + 1), 0);
last = now;
}
}