diff options
author | UbitUmarov | 2014-08-16 22:16:15 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-16 22:16:15 +0100 |
commit | f8b8cf3d8f6c5454967ce1707a007383e3fc5a42 (patch) | |
tree | 99f0a41711a00269ab27874fda7d84d2088c45bf | |
parent | minor low resolution debug timming (diff) | |
download | opensim-SC-f8b8cf3d8f6c5454967ce1707a007383e3fc5a42.zip opensim-SC-f8b8cf3d8f6c5454967ce1707a007383e3fc5a42.tar.gz opensim-SC-f8b8cf3d8f6c5454967ce1707a007383e3fc5a42.tar.bz2 opensim-SC-f8b8cf3d8f6c5454967ce1707a007383e3fc5a42.tar.xz |
more detailed timing on completmovement
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index fc08b07..5af6a6c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1786,6 +1786,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1786 | AbsolutePosition = pos; | 1786 | AbsolutePosition = pos; |
1787 | } | 1787 | } |
1788 | */ | 1788 | */ |
1789 | |||
1790 | m_log.DebugFormat("[CompleteMovement] WaitForUpdateAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | ||
1791 | |||
1789 | bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); | 1792 | bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); |
1790 | if (!MakeRootAgent(AbsolutePosition, flying)) | 1793 | if (!MakeRootAgent(AbsolutePosition, flying)) |
1791 | { | 1794 | { |
@@ -1796,6 +1799,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1796 | return; | 1799 | return; |
1797 | } | 1800 | } |
1798 | 1801 | ||
1802 | m_log.DebugFormat("[CompleteMovement] MakeRootAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | ||
1803 | |||
1799 | Vector3 look = Lookat; | 1804 | Vector3 look = Lookat; |
1800 | if ((Math.Abs(look.X) < 0.01) && (Math.Abs(look.Y) < 0.01)) | 1805 | if ((Math.Abs(look.X) < 0.01) && (Math.Abs(look.Y) < 0.01)) |
1801 | { | 1806 | { |
@@ -1827,6 +1832,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1827 | 1832 | ||
1828 | // m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); | 1833 | // m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); |
1829 | 1834 | ||
1835 | m_log.DebugFormat("[CompleteMovement] MoveAgentIntoRegion: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | ||
1836 | |||
1830 | if (!string.IsNullOrEmpty(m_callbackURI)) | 1837 | if (!string.IsNullOrEmpty(m_callbackURI)) |
1831 | { | 1838 | { |
1832 | // We cannot sleep here since this would hold up the inbound packet processing thread, as | 1839 | // We cannot sleep here since this would hold up the inbound packet processing thread, as |
@@ -1855,6 +1862,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1855 | // client.Name, client.AgentId, m_scene.RegionInfo.RegionName); | 1862 | // client.Name, client.AgentId, m_scene.RegionInfo.RegionName); |
1856 | // } | 1863 | // } |
1857 | 1864 | ||
1865 | m_log.DebugFormat("[CompleteMovement] ReleaseAgent: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | ||
1866 | |||
1858 | m_previusParcelHide = false; | 1867 | m_previusParcelHide = false; |
1859 | m_previusParcelUUID = UUID.Zero; | 1868 | m_previusParcelUUID = UUID.Zero; |
1860 | m_currentParcelHide = false; | 1869 | m_currentParcelHide = false; |
@@ -1876,6 +1885,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1876 | 1885 | ||
1877 | ValidateAndSendAppearanceAndAgentData(); | 1886 | ValidateAndSendAppearanceAndAgentData(); |
1878 | 1887 | ||
1888 | m_log.DebugFormat("[CompleteMovement] ValidateAndSendAppearanceAndAgentData: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | ||
1889 | |||
1879 | // attachments | 1890 | // attachments |
1880 | if (isNPC || (TeleportFlags & TeleportFlags.ViaLogin) != 0) | 1891 | if (isNPC || (TeleportFlags & TeleportFlags.ViaLogin) != 0) |
1881 | { | 1892 | { |
@@ -1905,6 +1916,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1905 | } | 1916 | } |
1906 | } | 1917 | } |
1907 | 1918 | ||
1919 | m_log.DebugFormat("[CompleteMovement] attachments: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | ||
1920 | |||
1908 | // Create child agents in neighbouring regions | 1921 | // Create child agents in neighbouring regions |
1909 | if (openChildAgents) | 1922 | if (openChildAgents) |
1910 | { | 1923 | { |
@@ -1914,10 +1927,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1914 | } | 1927 | } |
1915 | } | 1928 | } |
1916 | 1929 | ||
1930 | m_log.DebugFormat("[CompleteMovement] openChildAgents: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | ||
1931 | |||
1917 | // send the rest of the world | 1932 | // send the rest of the world |
1918 | if (m_teleportFlags > 0 && !isNPC) | 1933 | if (m_teleportFlags > 0 && !isNPC) |
1919 | SendInitialDataToMe(); | 1934 | SendInitialDataToMe(); |
1920 | 1935 | ||
1936 | m_log.DebugFormat("[CompleteMovement] SendInitialDataToMe: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | ||
1937 | |||
1921 | if (!IsChildAgent) | 1938 | if (!IsChildAgent) |
1922 | { | 1939 | { |
1923 | // moved from makeroot missing in sendInitialDataToMe | 1940 | // moved from makeroot missing in sendInitialDataToMe |
@@ -1934,6 +1951,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1934 | IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); | 1951 | IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); |
1935 | if (friendsModule != null) | 1952 | if (friendsModule != null) |
1936 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 1953 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
1954 | |||
1955 | m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts)); | ||
1937 | } | 1956 | } |
1938 | } | 1957 | } |
1939 | } | 1958 | } |