epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Stopwatch.ElapsedTime() a property and TimeSpan

Browse Source
This commit is contained in:
Pavlos Touboulidis
2014-04-23 00:56:07 +03:00
parent 082667eeea
commit 035834978d
10 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -478,7 +478,7 @@ namespace OpenRA
Tick(orderManager); Tick(orderManager);
var waitTime = Math.Min(idealFrameTime - sw.ElapsedTime(), 1); var waitTime = Math.Min(idealFrameTime - sw.Elapsed.TotalSeconds, 1);
if (waitTime > 0) if (waitTime > 0)
System.Threading.Thread.Sleep(TimeSpan.FromSeconds(waitTime)); System.Threading.Thread.Sleep(TimeSpan.FromSeconds(waitTime));
} }

4
OpenRA.Game/Settings.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -71,7 +71,7 @@ namespace OpenRA
public bool BotDebug = false; public bool BotDebug = false;
public bool PerfText = false; public bool PerfText = false;
public bool PerfGraph = false; public bool PerfGraph = false;
public float LongTickThreshold = 0.001f; public TimeSpan LongTickThreshold = TimeSpan.FromMilliseconds(1d);
public bool SanityCheckUnsyncedCode = false; public bool SanityCheckUnsyncedCode = false;
public int Samples = 25; public int Samples = 25;
public bool IgnoreVersionMismatch = false; public bool IgnoreVersionMismatch = false;

4
OpenRA.Game/Support/PerfHistory.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -116,7 +116,7 @@ namespace OpenRA.Support
public void Dispose() public void Dispose()
{ {
PerfHistory.Increment(Item, sw.ElapsedTime() * 1000); PerfHistory.Increment(Item, sw.Elapsed.TotalMilliseconds);
} }
} }
} }

9
OpenRA.Game/Support/Stopwatch.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -13,14 +13,15 @@ namespace OpenRA.Support
public class Stopwatch public class Stopwatch
{ {
System.Diagnostics.Stopwatch sw; System.Diagnostics.Stopwatch sw;
public Stopwatch ()
public Stopwatch()
{ {
Reset(); Reset();
} }
public double ElapsedTime() public System.TimeSpan Elapsed
{ {
return sw.Elapsed.TotalMilliseconds / 1000.0; get { return this.sw.Elapsed; }
} }
public void Reset() public void Reset()

10
OpenRA.Game/Support/Timer.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -13,14 +13,14 @@ namespace OpenRA.Support
public static class Timer public static class Timer
{ {
static Stopwatch sw = new Stopwatch(); static Stopwatch sw = new Stopwatch();
static double lastTime = 0; static System.TimeSpan lastTime;
public static void Time( string message ) public static void Time( string message )
{ {
var time = sw.ElapsedTime(); var time = sw.Elapsed;
var dt = time - lastTime; var dt = time - lastTime;
if( dt > 0.0001 ) if( dt.TotalSeconds > 0.0001 )
Log.Write("perf", message, dt ); Log.Write("perf", message, dt.TotalSeconds );
lastTime = time; lastTime = time;
} }
} }

6
OpenRA.Game/Traits/Util.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -83,9 +83,9 @@ namespace OpenRA.Traits
var sw = new Stopwatch(); var sw = new Stopwatch();
act = act.Tick(self); act = act.Tick(self);
var dt = sw.ElapsedTime(); var dt = sw.Elapsed;
if (dt > Game.Settings.Debug.LongTickThreshold) if (dt > Game.Settings.Debug.LongTickThreshold)
Log.Write("perf", "[{2}] Activity: {0} ({1:0.000} ms)", prev, dt * 1000, Game.LocalTick); Log.Write("perf", "[{2}] Activity: {0} ({1:0.000} ms)", prev, dt.TotalMilliseconds, Game.LocalTick);
if (prev == act) if (prev == act)
break; break;

10
OpenRA.Game/WorldUtils.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -171,17 +171,17 @@ namespace OpenRA
} }
} }
public static void DoTimed<T>(this IEnumerable<T> e, Action<T> a, string text, double time) public static void DoTimed<T>(this IEnumerable<T> e, Action<T> a, string text, TimeSpan time)
{ {
var sw = new Stopwatch(); var sw = new Stopwatch();
e.Do(x => e.Do(x =>
{ {
var t = sw.ElapsedTime(); var t = sw.Elapsed;
a(x); a(x);
var dt = sw.ElapsedTime() - t; var dt = sw.Elapsed - t;
if (dt > time) if (dt > time)
Log.Write("perf", text, x, dt * 1000, Game.LocalTick); Log.Write("perf", text, x, dt.TotalMilliseconds, Game.LocalTick);
}); });
} }

4
OpenRA.Mods.Cnc/CncLoadScreen.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -76,7 +76,7 @@ namespace OpenRA.Mods.Cnc
public void Display() public void Display()
{ {
if (r == null || loadTimer.ElapsedTime() < 0.25) if (r == null || loadTimer.Elapsed.TotalSeconds < 0.25)
return; return;
loadTimer.Reset(); loadTimer.Reset();

4
OpenRA.Mods.RA/DefaultLoadScreen.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -55,7 +55,7 @@ namespace OpenRA.Mods.RA
return; return;
// Update text at most every 0.5 seconds // Update text at most every 0.5 seconds
if (lastUpdate.ElapsedTime() < 0.5) if (lastUpdate.Elapsed.TotalSeconds < 0.5)
return; return;
if (r.Fonts == null) if (r.Fonts == null)

4
OpenRA.Mods.RA/World/DomainIndex.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * 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 * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -241,7 +241,7 @@ namespace OpenRA.Mods.RA
domain += 1; domain += 1;
} }
Log.Write("debug", "{0}: Found {1} domains. Took {2} s", map.Title, domain-1, timer.ElapsedTime()); Log.Write("debug", "{0}: Found {1} domains. Took {2} s", map.Title, domain-1, timer.Elapsed.TotalSeconds);
} }
} }
} }