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

ubOde: comment out some debug stats

httptests
UbitUmarov 2017-09-08 20:04:16 +01:00
parent 0ac81f6a09
commit b581a64788
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
View File

@ -1575,7 +1575,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
double maxChangestime = (int)(reqTimeStep * 500f); // half the time double maxChangestime = (int)(reqTimeStep * 500f); // half the time
double maxLoopTime = (int)(reqTimeStep * 1200f); // 1.2 the time double maxLoopTime = (int)(reqTimeStep * 1200f); // 1.2 the time
/*
double collisionTime = 0; double collisionTime = 0;
double qstepTIme = 0; double qstepTIme = 0;
double tmpTime = 0; double tmpTime = 0;
@ -1584,7 +1584,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
double updatesTime = 0; double updatesTime = 0;
double moveTime = 0; double moveTime = 0;
double rayTime = 0; double rayTime = 0;
*/
d.AllocateODEDataForThread(~0U); d.AllocateODEDataForThread(~0U);
if (ChangesQueue.Count > 0) if (ChangesQueue.Count > 0)
@ -1621,7 +1621,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
m_global_contactcount = 0; m_global_contactcount = 0;
tmpTime = Util.GetTimeStampMS(); // tmpTime = Util.GetTimeStampMS();
// Move characters // Move characters
lock (_characters) lock (_characters)
@ -1650,17 +1650,17 @@ namespace OpenSim.Region.PhysicsModule.ubOde
aprim.Move(); aprim.Move();
} }
} }
moveTime += Util.GetTimeStampMS() - tmpTime; // moveTime += Util.GetTimeStampMS() - tmpTime;
tmpTime = Util.GetTimeStampMS(); // tmpTime = Util.GetTimeStampMS();
m_rayCastManager.ProcessQueuedRequests(); m_rayCastManager.ProcessQueuedRequests();
rayTime += Util.GetTimeStampMS() - tmpTime; // rayTime += Util.GetTimeStampMS() - tmpTime;
tmpTime = Util.GetTimeStampMS(); // tmpTime = Util.GetTimeStampMS();
collision_optimized(); collision_optimized();
collisionTime += Util.GetTimeStampMS() - tmpTime; // collisionTime += Util.GetTimeStampMS() - tmpTime;
tmpTime = Util.GetTimeStampMS(); // tmpTime = Util.GetTimeStampMS();
lock(_collisionEventPrimRemove) lock(_collisionEventPrimRemove)
{ {
foreach (PhysicsActor obj in _collisionEventPrimRemove) foreach (PhysicsActor obj in _collisionEventPrimRemove)
@ -1699,14 +1699,14 @@ namespace OpenSim.Region.PhysicsModule.ubOde
foreach(OdePrim prm in sleepers) foreach(OdePrim prm in sleepers)
prm.SleeperAddCollisionEvents(); prm.SleeperAddCollisionEvents();
sleepers.Clear(); sleepers.Clear();
collisonRepo += Util.GetTimeStampMS() - tmpTime; // collisonRepo += Util.GetTimeStampMS() - tmpTime;
// do a ode simulation step // do a ode simulation step
tmpTime = Util.GetTimeStampMS(); // tmpTime = Util.GetTimeStampMS();
d.WorldQuickStep(world, ODE_STEPSIZE); d.WorldQuickStep(world, ODE_STEPSIZE);
d.JointGroupEmpty(contactgroup); d.JointGroupEmpty(contactgroup);
qstepTIme += Util.GetTimeStampMS() - tmpTime; // qstepTIme += Util.GetTimeStampMS() - tmpTime;
// update managed ideia of physical data and do updates to core // update managed ideia of physical data and do updates to core
/* /*
@ -1812,7 +1812,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
int ngeoms = d.NTotalGeoms; int ngeoms = d.NTotalGeoms;
*/ */
/*
looptimeMS /= nodeframes; looptimeMS /= nodeframes;
collisionTime /= nodeframes; collisionTime /= nodeframes;
qstepTIme /= nodeframes; qstepTIme /= nodeframes;
@ -1827,6 +1827,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
} }
*/
/* /*
// Finished with all sim stepping. If requested, dump world state to file for debugging. // Finished with all sim stepping. If requested, dump world state to file for debugging.
// TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed? // TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed?