From f6642a1cc88db4d021a5f6ed8e983622bb598003 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 16 Aug 2014 21:53:45 +0100 Subject: [PATCH] minor low resolution debug timming --- .../Framework/EntityTransfer/EntityTransferModule.cs | 7 +++++-- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 890160b22b..f639668aad 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -1674,8 +1674,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying) { + int ts = Util.EnvironmentTickCount(); try { + AgentData cAgent = new AgentData(); agent.CopyTo(cAgent); cAgent.Position = pos + agent.Velocity; @@ -1704,6 +1706,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer return false; } + m_log.DebugFormat("[CrossAgentIntoNewRegionMain] ok, time {0}ms",Util.EnvironmentTickCountSubtract(ts)); + } catch (Exception e) { @@ -1721,6 +1725,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version) { + agent.ControllingClient.RequestClientInfo(); string agentcaps; @@ -1784,8 +1789,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // agent.SendOtherAgentsAvatarDataToMe(); // agent.SendOtherAgentsAppearanceToMe(); - - // Next, let's close the child agent connections that are too far away. uint neighbourx; uint neighboury; diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index faa5334a22..fc08b07e4b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1754,7 +1754,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void CompleteMovement(IClientAPI client, bool openChildAgents) { -// DateTime startTime = DateTime.Now; + int ts = Util.EnvironmentTickCount(); m_log.InfoFormat( "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}", @@ -1947,6 +1947,8 @@ namespace OpenSim.Region.Framework.Scenes ParcelLoginCheck(m_currentParcelUUID); m_currentParcelHide = newhide; } + + m_log.DebugFormat("[CompleteMovement] end: {0}ms", Util.EnvironmentTickCountSubtract(ts)); } ///