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

add trait query report on disconnect

Browse Source
This commit is contained in:
Chris Forbes
2011-04-22 11:12:50 +12:45
parent e829c01ee6
commit c7ee613ca0
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -326,6 +326,8 @@ namespace OpenRA
public static void Disconnect() public static void Disconnect()
{ {
orderManager.world.traitDict.PrintReport();
if (IsHost && server != null) if (IsHost && server != null)
server.Shutdown(); server.Shutdown();

15
OpenRA.Game/TraitDictionary.cs
View File

@@ -23,6 +23,12 @@ namespace OpenRA
{ {
return traits.GetOrAdd( t, doCreateTraitContainer ); return traits.GetOrAdd( t, doCreateTraitContainer );
} }
public void PrintReport()
{
foreach( var t in traits.OrderByDescending(t => t.Value.Queries).TakeWhile(t => t.Value.Queries > 0) )
Console.WriteLine ("{0}: {1}", t.Key.Name, t.Value.Queries );
}
// construct this delegate once. // construct this delegate once.
static Func<Type, ITraitContainer> doCreateTraitContainer = CreateTraitContainer; static Func<Type, ITraitContainer> doCreateTraitContainer = CreateTraitContainer;
@@ -90,12 +96,17 @@ namespace OpenRA
{ {
void Add( Actor actor, object trait ); void Add( Actor actor, object trait );
void RemoveActor( uint actor ); void RemoveActor( uint actor );
int Queries { get; }
} }
class TraitContainer<T> : ITraitContainer class TraitContainer<T> : ITraitContainer
{ {
List<Actor> actors = new List<Actor>(); List<Actor> actors = new List<Actor>();
List<T> traits = new List<T>(); List<T> traits = new List<T>();
int queries;
public int Queries { get { return queries; } }
public void Add( Actor actor, object trait ) public void Add( Actor actor, object trait )
{ {
@@ -106,6 +117,7 @@ namespace OpenRA
public T Get( uint actor ) public T Get( uint actor )
{ {
++queries;
var index = actors.BinarySearchMany( actor ); var index = actors.BinarySearchMany( actor );
if( index >= actors.Count || actors[ index ].ActorID != actor ) if( index >= actors.Count || actors[ index ].ActorID != actor )
throw new InvalidOperationException( string.Format( "TraitDictionary does not contain instance of type `{0}`", typeof( T ) ) ); throw new InvalidOperationException( string.Format( "TraitDictionary does not contain instance of type `{0}`", typeof( T ) ) );
@@ -117,6 +129,7 @@ namespace OpenRA
public T GetOrDefault( uint actor ) public T GetOrDefault( uint actor )
{ {
++queries;
var index = actors.BinarySearchMany( actor ); var index = actors.BinarySearchMany( actor );
if( index >= actors.Count || actors[ index ].ActorID != actor ) if( index >= actors.Count || actors[ index ].ActorID != actor )
return default( T ); return default( T );
@@ -127,6 +140,7 @@ namespace OpenRA
public IEnumerable<T> GetMultiple( uint actor ) public IEnumerable<T> GetMultiple( uint actor )
{ {
++queries;
var index = actors.BinarySearchMany( actor ); var index = actors.BinarySearchMany( actor );
while( index < actors.Count && actors[ index ].ActorID == actor ) while( index < actors.Count && actors[ index ].ActorID == actor )
{ {
@@ -137,6 +151,7 @@ namespace OpenRA
public IEnumerable<TraitPair<T>> All() public IEnumerable<TraitPair<T>> All()
{ {
++queries;
for( int i = 0 ; i < actors.Count ; i++ ) for( int i = 0 ; i < actors.Count ; i++ )
yield return new TraitPair<T> { Actor = actors[ i ], Trait = traits[ i ] }; yield return new TraitPair<T> { Actor = actors[ i ], Trait = traits[ i ] };
} }