aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-16 19:34:48 +0000
committerTeravus Ovares2008-01-16 19:34:48 +0000
commitc3061717d0328c4d408b834606c4ddeea12d5662 (patch)
tree5616f50ee0fd3f83965f6e378b307ef32f632724 /OpenSim/Region/ClientStack
parent* Store task inventory when an object is taken into agent inventory (diff)
downloadopensim-SC_OLD-c3061717d0328c4d408b834606c4ddeea12d5662.zip
opensim-SC_OLD-c3061717d0328c4d408b834606c4ddeea12d5662.tar.gz
opensim-SC_OLD-c3061717d0328c4d408b834606c4ddeea12d5662.tar.bz2
opensim-SC_OLD-c3061717d0328c4d408b834606c4ddeea12d5662.tar.xz
* Fixed a packet counting issue that I introduced
* Fixed a bunch of goofy math for calculating the sim stats counters * Made most of the sim stats counters additive so it's easy to change the sim stats interval * Changed the sim stats send interval to 3 seconds
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 0a291a8..414c81e 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -65,11 +65,11 @@ namespace OpenSim.Region.ClientStack
65 private Timer m_clientPingTimer; 65 private Timer m_clientPingTimer;
66 66
67 private int m_packetsReceived = 0; 67 private int m_packetsReceived = 0;
68 private int m_lastpacketsSentToScene = 0; 68 private int m_lastPacketsReceivedSentToScene = 0;
69 private int m_unAckedBytes = 0; 69 private int m_unAckedBytes = 0;
70 70
71 private int m_packetsSent = 0; 71 private int m_packetsSent = 0;
72 private int m_lastPacketsSent = 0; 72 private int m_lastPacketsSentSentToScene = 0;
73 73
74 private int m_probesWithNoIngressPackets = 0; 74 private int m_probesWithNoIngressPackets = 0;
75 private int m_lastPacketsReceived = 0; 75 private int m_lastPacketsReceived = 0;
@@ -426,7 +426,7 @@ namespace OpenSim.Region.ClientStack
426 m_lastPacketsReceived = m_packetsReceived; 426 m_lastPacketsReceived = m_packetsReceived;
427 427
428 } 428 }
429 SendPacketStats(); 429 //SendPacketStats();
430 } 430 }
431 431
432 # region Setup 432 # region Setup
@@ -2503,7 +2503,7 @@ namespace OpenSim.Region.ClientStack
2503 2503
2504 SendAcks(); 2504 SendAcks();
2505 ResendUnacked(); 2505 ResendUnacked();
2506 2506 SendPacketStats();
2507 2507
2508 } 2508 }
2509 2509
@@ -2511,9 +2511,9 @@ namespace OpenSim.Region.ClientStack
2511 { 2511 {
2512 if (OnPacketStats != null) 2512 if (OnPacketStats != null)
2513 { 2513 {
2514 OnPacketStats(m_packetsReceived - m_lastPacketsReceived, m_packetsSent - m_lastPacketsSent, m_unAckedBytes); 2514 OnPacketStats(m_packetsReceived - m_lastPacketsReceivedSentToScene, m_packetsSent - m_lastPacketsSentSentToScene, m_unAckedBytes);
2515 m_lastPacketsReceived = m_packetsReceived; 2515 m_lastPacketsReceivedSentToScene = m_packetsReceived;
2516 m_lastPacketsSent = m_packetsSent; 2516 m_lastPacketsSentSentToScene = m_packetsSent;
2517 } 2517 }
2518 } 2518 }
2519 2519