OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-05-31 21:40:15 -04:00
parent d9b358886a d1b5f8d9d7
commit 3b772e7a45
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,11 +155,6 @@ namespace OpenSim.Region.Physics.OdePlugin
/// </summary> /// </summary>
public const string ODENativeStepFrameMsStatName = "ODENativeStepFrameMS"; public const string ODENativeStepFrameMsStatName = "ODENativeStepFrameMS";
/// <summary>
/// Stat name for the number of milliseconds that ODE spends in native collision code.
/// </summary>
public const string ODENativeCollisionFrameMsStatName = "ODENativeCollisionFrameMS";
/// <summary> /// <summary>
/// Stat name for the number of milliseconds that ODE spends in native space collision code. /// Stat name for the number of milliseconds that ODE spends in native space collision code.
/// </summary> /// </summary>
@ -170,6 +165,11 @@ namespace OpenSim.Region.Physics.OdePlugin
/// </summary> /// </summary>
public const string ODENativeGeomCollisionFrameMsStatName = "ODENativeGeomCollisionFrameMS"; public const string ODENativeGeomCollisionFrameMsStatName = "ODENativeGeomCollisionFrameMS";
/// <summary>
/// Stat name for time spent notifying listeners of collisions
/// </summary>
public const string ODECollisionNotificationFrameMsStatName = "ODECollisionNotificationFrameMS";
/// <summary> /// <summary>
/// Stat name for the milliseconds spent updating avatar position and velocity /// Stat name for the milliseconds spent updating avatar position and velocity
/// </summary> /// </summary>
@ -2998,6 +2998,9 @@ namespace OpenSim.Region.Physics.OdePlugin
collision_optimized(); collision_optimized();
if (CollectStats)
tempTick = Util.EnvironmentTickCount();
foreach (PhysicsActor obj in _collisionEventPrim.Values) foreach (PhysicsActor obj in _collisionEventPrim.Values)
{ {
// m_log.DebugFormat("[PHYSICS]: Assessing {0} {1} for collision events", obj.SOPName, obj.LocalID); // m_log.DebugFormat("[PHYSICS]: Assessing {0} {1} for collision events", obj.SOPName, obj.LocalID);
@ -3024,7 +3027,12 @@ namespace OpenSim.Region.Physics.OdePlugin
m_global_contactcount = 0; m_global_contactcount = 0;
if (CollectStats) if (CollectStats)
{
m_stats[ODECollisionNotificationFrameMsStatName]
+= Util.EnvironmentTickCountSubtract(tempTick);
tempTick = Util.EnvironmentTickCount(); tempTick = Util.EnvironmentTickCount();
}
d.WorldQuickStep(world, ODE_STEPSIZE); d.WorldQuickStep(world, ODE_STEPSIZE);
@ -4136,10 +4144,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
returnStats = new Dictionary<string, float>(m_stats); returnStats = new Dictionary<string, float>(m_stats);
returnStats[ODENativeCollisionFrameMsStatName]
= returnStats[ODENativeSpaceCollisionFrameMsStatName]
+ returnStats[ODENativeGeomCollisionFrameMsStatName];
InitializeExtraStats(); InitializeExtraStats();
} }
@ -4148,13 +4152,11 @@ namespace OpenSim.Region.Physics.OdePlugin
private void InitializeExtraStats() private void InitializeExtraStats()
{ {
// No need to zero since this is calculated by addition
// m_stats[ODENativeCollisionFrameMsStatName] = 0;
m_stats[ODETotalFrameMsStatName] = 0; m_stats[ODETotalFrameMsStatName] = 0;
m_stats[ODENativeStepFrameMsStatName] = 0; m_stats[ODENativeStepFrameMsStatName] = 0;
m_stats[ODENativeSpaceCollisionFrameMsStatName] = 0; m_stats[ODENativeSpaceCollisionFrameMsStatName] = 0;
m_stats[ODENativeGeomCollisionFrameMsStatName] = 0; m_stats[ODENativeGeomCollisionFrameMsStatName] = 0;
m_stats[ODECollisionNotificationFrameMsStatName] = 0;
m_stats[ODEAvatarContactsStatsName] = 0; m_stats[ODEAvatarContactsStatsName] = 0;
m_stats[ODEPrimContactsStatName] = 0; m_stats[ODEPrimContactsStatName] = 0;
m_stats[ODEAvatarUpdateFrameMsStatName] = 0; m_stats[ODEAvatarUpdateFrameMsStatName] = 0;