Remove custom Stopwatch wrapper

Remove the redirection (that doesn't offer any new functionality)
and replace it with the familiar System.Diagnostics.Stopwatch.
This commit is contained in:
Pavlos Touboulidis
2014-04-26 23:49:21 +03:00
parent 275f6683c6
commit c28faffa45
10 changed files with 18 additions and 43 deletions

View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -484,7 +485,7 @@ namespace OpenRA
{ {
if (Settings.Graphics.CapFramerate) if (Settings.Graphics.CapFramerate)
{ {
var sw = new Stopwatch(); var sw = Stopwatch.StartNew();
Tick(orderManager); Tick(orderManager);

View File

@@ -291,7 +291,6 @@
<Compile Include="Primitives\PriorityQueue.cs" /> <Compile Include="Primitives\PriorityQueue.cs" />
<Compile Include="Primitives\Set.cs" /> <Compile Include="Primitives\Set.cs" />
<Compile Include="Support\Log.cs" /> <Compile Include="Support\Log.cs" />
<Compile Include="Support\Stopwatch.cs" />
<Compile Include="Support\PerfTimer.cs" /> <Compile Include="Support\PerfTimer.cs" />
<Compile Include="Exts.cs" /> <Compile Include="Exts.cs" />
<Compile Include="Hotkey.cs" /> <Compile Include="Hotkey.cs" />

View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using OpenRA.Primitives; using OpenRA.Primitives;
@@ -106,7 +107,7 @@ namespace OpenRA.Support
public class PerfSample : IDisposable public class PerfSample : IDisposable
{ {
readonly Stopwatch sw = new Stopwatch(); readonly Stopwatch sw = Stopwatch.StartNew();
readonly string Item; readonly string Item;
public PerfSample(string item) public PerfSample(string item)

View File

@@ -9,6 +9,7 @@
#endregion #endregion
using System; using System;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
@@ -16,7 +17,7 @@ namespace OpenRA.Support
{ {
public class PerfTimer : IDisposable public class PerfTimer : IDisposable
{ {
readonly Stopwatch sw = new Stopwatch(); readonly Stopwatch sw = Stopwatch.StartNew();
readonly string Name; readonly string Name;
// //

View File

@@ -1,32 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
namespace OpenRA.Support
{
public class Stopwatch
{
System.Diagnostics.Stopwatch sw;
public Stopwatch()
{
Reset();
}
public System.TimeSpan Elapsed
{
get { return this.sw.Elapsed; }
}
public void Reset()
{
sw = System.Diagnostics.Stopwatch.StartNew();
}
}
}

View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using OpenRA.Support; using OpenRA.Support;
@@ -81,7 +82,7 @@ namespace OpenRA.Traits
{ {
var prev = act; var prev = act;
var sw = new Stopwatch(); var sw = Stopwatch.StartNew();
act = act.Tick(self); act = act.Tick(self);
var dt = sw.Elapsed; var dt = sw.Elapsed;
if (dt > Game.Settings.Debug.LongTickThreshold) if (dt > Game.Settings.Debug.LongTickThreshold)

View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
@@ -173,7 +174,7 @@ namespace OpenRA
public static void DoTimed<T>(this IEnumerable<T> e, Action<T> a, string text, TimeSpan time) public static void DoTimed<T>(this IEnumerable<T> e, Action<T> a, string text, TimeSpan time)
{ {
var sw = new Stopwatch(); var sw = Stopwatch.StartNew();
e.Do(x => e.Do(x =>
{ {

View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.FileSystem; using OpenRA.FileSystem;
@@ -22,7 +23,7 @@ namespace OpenRA.Mods.Cnc
public class CncLoadScreen : ILoadScreen public class CncLoadScreen : ILoadScreen
{ {
Dictionary<string, string> loadInfo; Dictionary<string, string> loadInfo;
Stopwatch loadTimer = new Stopwatch(); Stopwatch loadTimer = Stopwatch.StartNew();
Sprite[] ss; Sprite[] ss;
int loadTick; int loadTick;
float2 nodPos, gdiPos, evaPos; float2 nodPos, gdiPos, evaPos;
@@ -79,7 +80,7 @@ namespace OpenRA.Mods.Cnc
if (r == null || loadTimer.Elapsed.TotalSeconds < 0.25) if (r == null || loadTimer.Elapsed.TotalSeconds < 0.25)
return; return;
loadTimer.Reset(); loadTimer.Restart();
loadTick = ++loadTick % 8; loadTick = ++loadTick % 8;
r.BeginFrame(float2.Zero, 1f); r.BeginFrame(float2.Zero, 1f);

View File

@@ -10,6 +10,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.FileSystem; using OpenRA.FileSystem;
@@ -23,7 +24,7 @@ namespace OpenRA.Mods.RA
public class DefaultLoadScreen : ILoadScreen public class DefaultLoadScreen : ILoadScreen
{ {
Dictionary<string, string> info; Dictionary<string, string> info;
Stopwatch lastUpdate = new Stopwatch(); Stopwatch lastUpdate = Stopwatch.StartNew();
Renderer r; Renderer r;
Rectangle stripeRect; Rectangle stripeRect;
@@ -61,7 +62,7 @@ namespace OpenRA.Mods.RA
if (r.Fonts == null) if (r.Fonts == null)
return; return;
lastUpdate.Reset(); lastUpdate.Restart();
var text = messages.Random(Game.CosmeticRandom); var text = messages.Random(Game.CosmeticRandom);
var textSize = r.Fonts["Bold"].Measure(text); var textSize = r.Fonts["Bold"].Measure(text);

View File

@@ -9,6 +9,7 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
@@ -187,7 +188,7 @@ namespace OpenRA.Mods.RA
void BuildDomains(World world) void BuildDomains(World world)
{ {
var timer = new Stopwatch(); var timer = Stopwatch.StartNew();
var map = world.Map; var map = world.Map;
var domain = 1; var domain = 1;