diff options
author | Justin Clark-Casey (justincc) | 2010-10-29 23:15:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-29 23:15:35 +0100 |
commit | abcde41c0dc003aa14577e3c58345c82d179c0d1 (patch) | |
tree | 1a102c5141fafd8ba4760433abd07764e0e7beb9 /OpenSim | |
parent | Rename the new default texture to be consistent with the others (diff) | |
parent | add timing report to CompleteScenePresence for diagnostic purposes (diff) | |
download | opensim-SC-abcde41c0dc003aa14577e3c58345c82d179c0d1.zip opensim-SC-abcde41c0dc003aa14577e3c58345c82d179c0d1.tar.gz opensim-SC-abcde41c0dc003aa14577e3c58345c82d179c0d1.tar.bz2 opensim-SC-abcde41c0dc003aa14577e3c58345c82d179c0d1.tar.xz |
Merge branch 'justincc-dev'
Diffstat (limited to '')
6 files changed, 23 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index cb298fd..161e8c2 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -615,8 +615,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
615 | 615 | ||
616 | // UseCircuitCode handling | 616 | // UseCircuitCode handling |
617 | if (packet.Type == PacketType.UseCircuitCode) | 617 | if (packet.Type == PacketType.UseCircuitCode) |
618 | { | 618 | { |
619 | m_log.Debug("[LLUDPSERVER]: Handling UseCircuitCode packet from " + buffer.RemoteEndPoint); | ||
620 | object[] array = new object[] { buffer, packet }; | 619 | object[] array = new object[] { buffer, packet }; |
621 | 620 | ||
622 | if (m_asyncPacketHandling) | 621 | if (m_asyncPacketHandling) |
@@ -827,9 +826,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
827 | 826 | ||
828 | private void HandleUseCircuitCode(object o) | 827 | private void HandleUseCircuitCode(object o) |
829 | { | 828 | { |
829 | DateTime startTime = DateTime.Now; | ||
830 | object[] array = (object[])o; | 830 | object[] array = (object[])o; |
831 | UDPPacketBuffer buffer = (UDPPacketBuffer)array[0]; | 831 | UDPPacketBuffer buffer = (UDPPacketBuffer)array[0]; |
832 | UseCircuitCodePacket packet = (UseCircuitCodePacket)array[1]; | 832 | UseCircuitCodePacket packet = (UseCircuitCodePacket)array[1]; |
833 | |||
834 | m_log.DebugFormat("[LLUDPSERVER]: Handling UseCircuitCode request from {0}", buffer.RemoteEndPoint); | ||
833 | 835 | ||
834 | IPEndPoint remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint; | 836 | IPEndPoint remoteEndPoint = (IPEndPoint)buffer.RemoteEndPoint; |
835 | 837 | ||
@@ -838,6 +840,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
838 | 840 | ||
839 | // Acknowledge the UseCircuitCode packet | 841 | // Acknowledge the UseCircuitCode packet |
840 | SendAckImmediate(remoteEndPoint, packet.Header.Sequence); | 842 | SendAckImmediate(remoteEndPoint, packet.Header.Sequence); |
843 | |||
844 | m_log.DebugFormat( | ||
845 | "[LLUDPSERVER]: Handling UseCircuitCode request from {0} took {1}ms", | ||
846 | buffer.RemoteEndPoint, (DateTime.Now - startTime).Milliseconds); | ||
841 | } | 847 | } |
842 | 848 | ||
843 | private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber) | 849 | private void SendAckImmediate(IPEndPoint remoteEndpoint, uint sequenceNumber) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs index a64f785..6543845 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | |||
65 | 65 | ||
66 | public void OnMakeRootAgent(ScenePresence sp) | 66 | public void OnMakeRootAgent(ScenePresence sp) |
67 | { | 67 | { |
68 | m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); | 68 | // m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); |
69 | m_GridUserService.SetLastPosition(sp.UUID.ToString(), UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); | 69 | m_GridUserService.SetLastPosition(sp.UUID.ToString(), UUID.Zero, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); |
70 | } | 70 | } |
71 | 71 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs index 62b8278..fa5b873 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -71,7 +71,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence | |||
71 | 71 | ||
72 | public void OnMakeRootAgent(ScenePresence sp) | 72 | public void OnMakeRootAgent(ScenePresence sp) |
73 | { | 73 | { |
74 | m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); | 74 | // m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName); |
75 | m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID); | 75 | m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID); |
76 | } | 76 | } |
77 | 77 | ||
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index a182eea..3e478b0 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -324,7 +324,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
324 | if (threadrunning) return; | 324 | if (threadrunning) return; |
325 | threadrunning = true; | 325 | threadrunning = true; |
326 | 326 | ||
327 | m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread"); | 327 | // m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread"); |
328 | 328 | ||
329 | Watchdog.StartThread(process, "MapItemRequestThread", ThreadPriority.BelowNormal, true); | 329 | Watchdog.StartThread(process, "MapItemRequestThread", ThreadPriority.BelowNormal, true); |
330 | } | 330 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9402f8b..1fc3ed6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1075,9 +1075,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1075 | /// </summary> | 1075 | /// </summary> |
1076 | public void CompleteMovement(IClientAPI client) | 1076 | public void CompleteMovement(IClientAPI client) |
1077 | { | 1077 | { |
1078 | // DEBUG ON | 1078 | DateTime startTime = DateTime.Now; |
1079 | m_log.WarnFormat("[SCENE PRESENCE]: CompleteMovement for {0}",UUID); | 1079 | |
1080 | // DEBUG OFF | 1080 | m_log.DebugFormat( |
1081 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", | ||
1082 | client.Name, Scene.RegionInfo.RegionName); | ||
1081 | 1083 | ||
1082 | Vector3 look = Velocity; | 1084 | Vector3 look = Velocity; |
1083 | if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) | 1085 | if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) |
@@ -1125,6 +1127,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1125 | if (friendsModule != null) | 1127 | if (friendsModule != null) |
1126 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 1128 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
1127 | } | 1129 | } |
1130 | |||
1131 | m_log.DebugFormat( | ||
1132 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | ||
1133 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | ||
1128 | } | 1134 | } |
1129 | 1135 | ||
1130 | /// <summary> | 1136 | /// <summary> |
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index 976153f..09c31c3 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Services.PresenceService | |||
88 | 88 | ||
89 | public bool ReportAgent(UUID sessionID, UUID regionID) | 89 | public bool ReportAgent(UUID sessionID, UUID regionID) |
90 | { | 90 | { |
91 | m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID); | 91 | // m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID); |
92 | try | 92 | try |
93 | { | 93 | { |
94 | PresenceData pdata = m_Database.Get(sessionID); | 94 | PresenceData pdata = m_Database.Get(sessionID); |