diff options
author | Diva Canto | 2011-02-09 08:35:21 -0800 |
---|---|---|
committer | Diva Canto | 2011-02-09 08:35:21 -0800 |
commit | 1bba9c6300db10c78f606bf0c21be17004dde704 (patch) | |
tree | ae8ff6a079dff5c378b169df34213538e3a87b78 /OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | |
parent | More detection of negatives. (diff) | |
download | opensim-SC_OLD-1bba9c6300db10c78f606bf0c21be17004dde704.zip opensim-SC_OLD-1bba9c6300db10c78f606bf0c21be17004dde704.tar.gz opensim-SC_OLD-1bba9c6300db10c78f606bf0c21be17004dde704.tar.bz2 opensim-SC_OLD-1bba9c6300db10c78f606bf0c21be17004dde704.tar.xz |
Revert "Don't build strings unless we're in emergency debugging."
This reverts commit ba202ea9b08b1205de343c65fd209b6cca4cb6bc.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs index 20f0410..2d58b94 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | |||
@@ -468,7 +468,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
468 | for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) | 468 | for (int i = 0; i < THROTTLE_CATEGORY_COUNT; i++) |
469 | { | 469 | { |
470 | bucket = m_throttleCategories[i]; | 470 | bucket = m_throttleCategories[i]; |
471 | if (m_udpServer.EmergencyMonitoring && i == 4) | 471 | if (i == 4) |
472 | queueDebugOutput += m_packetOutboxes[i].Count + " "; // Serious debug business | 472 | queueDebugOutput += m_packetOutboxes[i].Count + " "; // Serious debug business |
473 | 473 | ||
474 | if (m_nextPackets[i] != null) | 474 | if (m_nextPackets[i] != null) |
@@ -477,17 +477,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
477 | // leaving a dequeued packet still waiting to be sent out. Try to | 477 | // leaving a dequeued packet still waiting to be sent out. Try to |
478 | // send it again | 478 | // send it again |
479 | OutgoingPacket nextPacket = m_nextPackets[i]; | 479 | OutgoingPacket nextPacket = m_nextPackets[i]; |
480 | if (m_udpServer.EmergencyMonitoring && i == 4) queueDebugOutput += "m_nextPackets[i] != null, " + nextPacket.Buffer.DataLength; | 480 | if (i == 4) queueDebugOutput += "m_nextPackets[i] != null, " + nextPacket.Buffer.DataLength; |
481 | if (bucket.RemoveTokens(nextPacket.Buffer.DataLength)) | 481 | if (bucket.RemoveTokens(nextPacket.Buffer.DataLength)) |
482 | { | 482 | { |
483 | if (m_udpServer.EmergencyMonitoring && i == 4) queueDebugOutput += " removed tokens "; | 483 | if (i == 4) queueDebugOutput += " removed tokens "; |
484 | // Send the packet | 484 | // Send the packet |
485 | m_udpServer.SendPacketFinal(nextPacket); | 485 | m_udpServer.SendPacketFinal(nextPacket); |
486 | m_nextPackets[i] = null; | 486 | m_nextPackets[i] = null; |
487 | packetSent = true; | 487 | packetSent = true; |
488 | } | 488 | } |
489 | else | 489 | else |
490 | if (m_udpServer.EmergencyMonitoring && i == 4) queueDebugOutput += " did not remove tokens "; | 490 | if (i == 4) queueDebugOutput += " did not remove tokens "; |
491 | } | 491 | } |
492 | else | 492 | else |
493 | { | 493 | { |
@@ -496,7 +496,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
496 | queue = m_packetOutboxes[i]; | 496 | queue = m_packetOutboxes[i]; |
497 | if (queue.Dequeue(out packet)) | 497 | if (queue.Dequeue(out packet)) |
498 | { | 498 | { |
499 | if (m_udpServer.EmergencyMonitoring && i == 4) queueDebugOutput += "m_nextPackets[i] == null, dq ok " + packet.Buffer.DataLength; | 499 | if (i == 4) queueDebugOutput += "m_nextPackets[i] == null, dq ok " + packet.Buffer.DataLength; |
500 | // A packet was pulled off the queue. See if we have | 500 | // A packet was pulled off the queue. See if we have |
501 | // enough tokens in the bucket to send it out | 501 | // enough tokens in the bucket to send it out |
502 | if (bucket.RemoveTokens(packet.Buffer.DataLength)) | 502 | if (bucket.RemoveTokens(packet.Buffer.DataLength)) |
@@ -504,13 +504,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
504 | // Send the packet | 504 | // Send the packet |
505 | m_udpServer.SendPacketFinal(packet); | 505 | m_udpServer.SendPacketFinal(packet); |
506 | packetSent = true; | 506 | packetSent = true; |
507 | if (m_udpServer.EmergencyMonitoring && i == 4) queueDebugOutput += " removed tokens "; | 507 | if (i == 4) queueDebugOutput += " removed tokens "; |
508 | } | 508 | } |
509 | else | 509 | else |
510 | { | 510 | { |
511 | // Save the dequeued packet for the next iteration | 511 | // Save the dequeued packet for the next iteration |
512 | m_nextPackets[i] = packet; | 512 | m_nextPackets[i] = packet; |
513 | if (m_udpServer.EmergencyMonitoring && i == 4) queueDebugOutput += " did not remove tokens "; | 513 | if (i == 4) queueDebugOutput += " did not remove tokens "; |
514 | } | 514 | } |
515 | 515 | ||
516 | // If the queue is empty after this dequeue, fire the queue | 516 | // If the queue is empty after this dequeue, fire the queue |
@@ -521,7 +521,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
521 | } | 521 | } |
522 | else | 522 | else |
523 | { | 523 | { |
524 | if (m_udpServer.EmergencyMonitoring && i == 4) queueDebugOutput += "m_nextPackets[i] == null, dq nok "; | 524 | if (i == 4) queueDebugOutput += "m_nextPackets[i] == null, dq nok "; |
525 | // No packets in this queue. Fire the queue empty callback | 525 | // No packets in this queue. Fire the queue empty callback |
526 | // if it has not been called recently | 526 | // if it has not been called recently |
527 | emptyCategories |= CategoryToFlag(i); | 527 | emptyCategories |= CategoryToFlag(i); |