aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-21 15:22:23 -0700
committerJohn Hurliman2009-10-21 15:22:23 -0700
commit2752a3525c6c57470024d0dddfd69d593abc4594 (patch)
treeb143a6c84d8fbfb75ee28b3e0d37720bcb92aa5c /OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
parentTesting out a hack to identify the source of the high cpu usage (diff)
downloadopensim-SC_OLD-2752a3525c6c57470024d0dddfd69d593abc4594.zip
opensim-SC_OLD-2752a3525c6c57470024d0dddfd69d593abc4594.tar.gz
opensim-SC_OLD-2752a3525c6c57470024d0dddfd69d593abc4594.tar.bz2
opensim-SC_OLD-2752a3525c6c57470024d0dddfd69d593abc4594.tar.xz
* Changed the timing calculations for sending resends/acks/pings from per-client back to per-scene
* Testing a fix from Jim to make the cpu usage fix cleaner
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs13
1 files changed, 1 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index de67ca7..0a090b4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -103,14 +103,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
103 public bool IsPaused; 103 public bool IsPaused;
104 /// <summary>Environment.TickCount when the last packet was received for this client</summary> 104 /// <summary>Environment.TickCount when the last packet was received for this client</summary>
105 public int TickLastPacketReceived; 105 public int TickLastPacketReceived;
106 /// <summary>Environment.TickCount of the last time the outgoing packet handler executed for this client</summary>
107 public int TickLastOutgoingPacketHandler;
108 /// <summary>Keeps track of the number of elapsed milliseconds since the last time the outgoing packet handler executed for this client</summary>
109 public int ElapsedMSOutgoingPacketHandler;
110 /// <summary>Keeps track of the number of 100 millisecond periods elapsed in the outgoing packet handler executed for this client</summary>
111 public int Elapsed100MSOutgoingPacketHandler;
112 /// <summary>Keeps track of the number of 500 millisecond periods elapsed in the outgoing packet handler executed for this client</summary>
113 public int Elapsed500MSOutgoingPacketHandler;
114 106
115 /// <summary>Smoothed round-trip time. A smoothed average of the round-trip time for sending a 107 /// <summary>Smoothed round-trip time. A smoothed average of the round-trip time for sending a
116 /// reliable packet to the client and receiving an ACK</summary> 108 /// reliable packet to the client and receiving an ACK</summary>
@@ -191,9 +183,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
191 183
192 // Initialize this to a sane value to prevent early disconnects 184 // Initialize this to a sane value to prevent early disconnects
193 TickLastPacketReceived = Environment.TickCount & Int32.MaxValue; 185 TickLastPacketReceived = Environment.TickCount & Int32.MaxValue;
194 ElapsedMSOutgoingPacketHandler = 0;
195 Elapsed100MSOutgoingPacketHandler = 0;
196 Elapsed500MSOutgoingPacketHandler = 0;
197 } 186 }
198 187
199 /// <summary> 188 /// <summary>
@@ -553,7 +542,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
553 } 542 }
554 543
555 // HACK: Try spending some extra time here to slow down OnQueueEmpty calls 544 // HACK: Try spending some extra time here to slow down OnQueueEmpty calls
556 System.Threading.Thread.Sleep(100); 545 //System.Threading.Thread.Sleep(100);
557 546
558 m_onQueueEmptyRunning[i] = false; 547 m_onQueueEmptyRunning[i] = false;
559 } 548 }