ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add optional stat for the other collision time per frame not spent in ODE native spaces or geom collision code

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2012-06-01 03:49:42 +01:00
parent d34b84b531
commit 200376b3c4
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@@ -190,6 +190,11 @@ namespace OpenSim.Region.Physics.OdePlugin
/// </summary>
public const string ODENativeGeomCollisionFrameMsStatName = "ODENativeGeomCollisionFrameMS";
/// <summary>
/// Time spent in collision processing that is not spent in native space or geom collision code.
/// </summary>
public const string ODEOtherCollisionFrameMsStatName = "ODEOtherCollisionFrameMS";
/// <summary>
/// Stat name for time spent notifying listeners of collisions
/// </summary>
@@ -3062,7 +3067,11 @@ namespace OpenSim.Region.Physics.OdePlugin
collision_optimized();
if (CollectStats)
tempTick = Util.EnvironmentTickCount();
{
tempTick2 = Util.EnvironmentTickCount();
m_stats[ODEOtherCollisionFrameMsStatName] += Util.EnvironmentTickCountSubtract(tempTick2, tempTick);
tempTick = tempTick2;
}
foreach (PhysicsActor obj in _collisionEventPrim.Values)
{
@@ -4210,6 +4219,11 @@ namespace OpenSim.Region.Physics.OdePlugin
InitializeExtraStats();
}
returnStats[ODEOtherCollisionFrameMsStatName]
= returnStats[ODEOtherCollisionFrameMsStatName]
- returnStats[ODENativeSpaceCollisionFrameMsStatName]
- returnStats[ODENativeGeomCollisionFrameMsStatName];
return returnStats;
}
@@ -4224,6 +4238,7 @@ namespace OpenSim.Region.Physics.OdePlugin
m_stats[ODENativeStepFrameMsStatName] = 0;
m_stats[ODENativeSpaceCollisionFrameMsStatName] = 0;
m_stats[ODENativeGeomCollisionFrameMsStatName] = 0;
m_stats[ODEOtherCollisionFrameMsStatName] = 0;
m_stats[ODECollisionNotificationFrameMsStatName] = 0;
m_stats[ODEAvatarContactsStatsName] = 0;
m_stats[ODEPrimContactsStatName] = 0;