aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-02-08 12:37:37 -0800
committerDiva Canto2011-02-08 12:37:37 -0800
commit82846afe4b2a141421bff136dec9eef553522aa7 (patch)
tree272daef3221d3287cefa352e6572529c473d4fc4
parentAdded emergency monitoring of UDP Outgoing packets thread. Just type "emergen... (diff)
downloadopensim-SC_OLD-82846afe4b2a141421bff136dec9eef553522aa7.zip
opensim-SC_OLD-82846afe4b2a141421bff136dec9eef553522aa7.tar.gz
opensim-SC_OLD-82846afe4b2a141421bff136dec9eef553522aa7.tar.bz2
opensim-SC_OLD-82846afe4b2a141421bff136dec9eef553522aa7.tar.xz
Minor improvement to previous commit.
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 72257d2..703ef6a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -1056,6 +1056,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1056 1056
1057 if (m_scene.EmergencyMonitoring) 1057 if (m_scene.EmergencyMonitoring)
1058 clientPacketHandler = MonitoredClientOutgoingPacketHandler; 1058 clientPacketHandler = MonitoredClientOutgoingPacketHandler;
1059 else
1060 clientPacketHandler = ClientOutgoingPacketHandler;
1059 1061
1060 // Handle outgoing packets, resends, acknowledgements, and pings for each 1062 // Handle outgoing packets, resends, acknowledgements, and pings for each
1061 // client. m_packetSent will be set to true if a packet is sent 1063 // client. m_packetSent will be set to true if a packet is sent
@@ -1197,8 +1199,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1197 // reuse this -- it's every 100ms 1199 // reuse this -- it's every 100ms
1198 if (m_scene.EmergencyMonitoring && nticks % 100 == 0) 1200 if (m_scene.EmergencyMonitoring && nticks % 100 == 0)
1199 { 1201 {
1200 m_log.InfoFormat("[LLUDPSERVER]: avg processing ticks: {0} avg unacked: {1} avg acks: {2} avg ping: {3} avg dequeue: {4} (pack sent? {5})", 1202 m_log.InfoFormat("[LLUDPSERVER]: avg processing ticks: {0} avg unacked: {1} avg acks: {2} avg ping: {3} avg dequeue: {4} (TickCountRes: {5})",
1201 avgProcessingTicks, avgResendUnackedTicks, avgSendAcksTicks, avgSendPingTicks, avgDequeueTicks, m_packetSent); 1203 avgProcessingTicks, avgResendUnackedTicks, avgSendAcksTicks, avgSendPingTicks, avgDequeueTicks, TickCountResolution);
1202 } 1204 }
1203 1205
1204 } 1206 }