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

minor low resolution debug timming

avinationmerge
UbitUmarov 2014-08-16 21:53:45 +01:00
parent 21b3980d2b
commit f6642a1cc8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1674,8 +1674,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying) public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying)
{ {
int ts = Util.EnvironmentTickCount();
try try
{ {
AgentData cAgent = new AgentData(); AgentData cAgent = new AgentData();
agent.CopyTo(cAgent); agent.CopyTo(cAgent);
cAgent.Position = pos + agent.Velocity; cAgent.Position = pos + agent.Velocity;
@ -1704,6 +1706,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return false; return false;
} }
m_log.DebugFormat("[CrossAgentIntoNewRegionMain] ok, time {0}ms",Util.EnvironmentTickCountSubtract(ts));
} }
catch (Exception e) catch (Exception e)
{ {
@ -1721,6 +1725,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
bool isFlying, string version) bool isFlying, string version)
{ {
agent.ControllingClient.RequestClientInfo(); agent.ControllingClient.RequestClientInfo();
string agentcaps; string agentcaps;
@ -1784,8 +1789,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// agent.SendOtherAgentsAvatarDataToMe(); // agent.SendOtherAgentsAvatarDataToMe();
// agent.SendOtherAgentsAppearanceToMe(); // agent.SendOtherAgentsAppearanceToMe();
// Next, let's close the child agent connections that are too far away. // Next, let's close the child agent connections that are too far away.
uint neighbourx; uint neighbourx;
uint neighboury; uint neighboury;

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1754,7 +1754,7 @@ namespace OpenSim.Region.Framework.Scenes
/// </param> /// </param>
public void CompleteMovement(IClientAPI client, bool openChildAgents) public void CompleteMovement(IClientAPI client, bool openChildAgents)
{ {
// DateTime startTime = DateTime.Now; int ts = Util.EnvironmentTickCount();
m_log.InfoFormat( m_log.InfoFormat(
"[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}", "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
@ -1947,6 +1947,8 @@ namespace OpenSim.Region.Framework.Scenes
ParcelLoginCheck(m_currentParcelUUID); ParcelLoginCheck(m_currentParcelUUID);
m_currentParcelHide = newhide; m_currentParcelHide = newhide;
} }
m_log.DebugFormat("[CompleteMovement] end: {0}ms", Util.EnvironmentTickCountSubtract(ts));
} }
/// <summary> /// <summary>