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

Cleanup/Housekeeping (#242)

Browse source
This commit is contained in:
Kamron Batman 2020-09-12 15:31:21 -07:00 • committed by GitHub
parent 90ede0659f
commit 741e8d8300
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
228 changed files with 6292 additions and 2690 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,23 +1,3 @@
/***************************************************************************
* Timer.cs
* -------------------
* begin : May 1, 2002
* copyright : (C) The RunUO Software Team
* email : info@runuo.com
*
* $Id$
*
***************************************************************************/
/***************************************************************************
*
* 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 2 of the License, or
* (at your option) any later version.
*
***************************************************************************/
using System;
using System.Collections.Generic;
using System.IO;
@ -73,7 +53,9 @@ namespace Server
}
if (DefRegCreation)
{
RegCreation();
}
}
public TimerPriority Priority
@ -82,14 +64,18 @@ namespace Server
set
{
if (!m_PrioritySet)
{
m_PrioritySet = true;
}
if (m_Priority != value)
{
m_Priority = value;
if (m_Running)
{
TimerThread.PriorityChange(this, (int)m_Priority);
}
}
}
}
@ -114,9 +100,13 @@ namespace Server
set
{
if (value)
{
Start();
}
else
{
Stop();
}
}
}
@ -134,7 +124,10 @@ namespace Server
public TimerProfile GetProfile()
{
if (!Core.Profiling) return null;
if (!Core.Profiling)
{
return null;
}
var name = ToString();
@ -169,7 +162,10 @@ namespace Server
{
var prof = GetProfile();
if (prof != null) prof.Created++;
if (prof != null)
{
prof.Created++;
}
}
public override string ToString() => GetType().FullName ?? "";
@ -177,22 +173,34 @@ namespace Server
public static TimerPriority ComputePriority(TimeSpan ts)
{
if (ts >= TimeSpan.FromMinutes(1.0))
{
return TimerPriority.FiveSeconds;
}
if (ts >= TimeSpan.FromSeconds(10.0))
{
return TimerPriority.OneSecond;
}
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;
}
@ -206,7 +214,10 @@ namespace Server
var prof = GetProfile();
if (prof != null) prof.Started++;
if (prof != null)
{
prof.Started++;
}
}
}
@ -219,7 +230,10 @@ namespace Server
var prof = GetProfile();
if (prof != null) prof.Stopped++;
if (prof != null)
{
prof.Stopped++;
}
}
}
@ -285,7 +299,9 @@ namespace Server
var key = t.ToString();
if (!hash.TryGetValue(key, out var list))
{
hash[key] = list = new List<Timer>();
}
list.Add(t);
}
@ -392,7 +408,9 @@ namespace Server
{
var now = Core.TickCount;
if (now < m_NextPriorities[i])
{
break;
}
m_NextPriorities[i] = now + m_PriorityDelays[i];
@ -412,15 +430,21 @@ namespace Server
loaded = true;
if (t.m_Count != 0 && ++t.m_Index >= t.m_Count)
{
t.Stop();
}
else
{
t.m_Next = now + t.m_Interval;
}
}
}
}
if (loaded)
{
Core.Set();
}
m_Signal.WaitOne(1, false);
}
@ -445,7 +469,9 @@ namespace Server
lock (m_InstancePool)
{
if (m_InstancePool.Count < 200) // Arbitrary
{
m_InstancePool.Enqueue(this);
}
}
}
@ -455,7 +481,10 @@ namespace Server
lock (m_InstancePool)
{
if (m_InstancePool.Count > 0) e = m_InstancePool.Dequeue();
if (m_InstancePool.Count > 0)
{
e = m_InstancePool.Dequeue();
}
}
if (e != null)

2
Projects/Server/Timer/TimerDelayCalls.cs
View file

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: TimerDelayCalls.cs *
* *