aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Statistics
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Statistics
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Framework/Statistics')
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsCollector.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 58d5621..cc64ed6 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using OpenMetaverse;
32using libsecondlife.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework.Statistics.Interfaces; 33using OpenSim.Framework.Statistics.Interfaces;
34 34
35namespace OpenSim.Framework.Statistics 35namespace OpenSim.Framework.Statistics
@@ -122,8 +122,8 @@ namespace OpenSim.Framework.Statistics
122 /// <summary> 122 /// <summary>
123 /// Retain a dictionary of all packet queues stats reporters 123 /// Retain a dictionary of all packet queues stats reporters
124 /// </summary> 124 /// </summary>
125 private IDictionary<LLUUID, PacketQueueStatsCollector> packetQueueStatsCollectors 125 private IDictionary<UUID, PacketQueueStatsCollector> packetQueueStatsCollectors
126 = new Dictionary<LLUUID, PacketQueueStatsCollector>(); 126 = new Dictionary<UUID, PacketQueueStatsCollector>();
127 127
128 public void AddAbnormalClientThreadTermination() 128 public void AddAbnormalClientThreadTermination()
129 { 129 {
@@ -176,9 +176,9 @@ namespace OpenSim.Framework.Statistics
176 /// <summary> 176 /// <summary>
177 /// Register as a packet queue stats provider 177 /// Register as a packet queue stats provider
178 /// </summary> 178 /// </summary>
179 /// <param name="uuid">An agent LLUUID</param> 179 /// <param name="uuid">An agent UUID</param>
180 /// <param name="provider"></param> 180 /// <param name="provider"></param>
181 public void RegisterPacketQueueStatsProvider(LLUUID uuid, IPullStatsProvider provider) 181 public void RegisterPacketQueueStatsProvider(UUID uuid, IPullStatsProvider provider)
182 { 182 {
183 lock (packetQueueStatsCollectors) 183 lock (packetQueueStatsCollectors)
184 { 184 {
@@ -191,8 +191,8 @@ namespace OpenSim.Framework.Statistics
191 /// <summary> 191 /// <summary>
192 /// Deregister a packet queue stats provider 192 /// Deregister a packet queue stats provider
193 /// </summary> 193 /// </summary>
194 /// <param name="uuid">An agent LLUUID</param> 194 /// <param name="uuid">An agent UUID</param>
195 public void DeregisterPacketQueueStatsProvider(LLUUID uuid) 195 public void DeregisterPacketQueueStatsProvider(UUID uuid)
196 { 196 {
197 lock (packetQueueStatsCollectors) 197 lock (packetQueueStatsCollectors)
198 { 198 {
@@ -302,7 +302,7 @@ Asset service request failures: {5}"+ Environment.NewLine,
302 "Send", "In", "Out", "Resend", "Land", "Wind", "Cloud", "Task", "Texture", "Asset")); 302 "Send", "In", "Out", "Resend", "Land", "Wind", "Cloud", "Task", "Texture", "Asset"));
303 sb.Append(Environment.NewLine); 303 sb.Append(Environment.NewLine);
304 304
305 foreach (LLUUID key in packetQueueStatsCollectors.Keys) 305 foreach (UUID key in packetQueueStatsCollectors.Keys)
306 { 306 {
307 sb.Append(string.Format("{0}: ", key)); 307 sb.Append(string.Format("{0}: ", key));
308 sb.Append(packetQueueStatsCollectors[key].Report()); 308 sb.Append(packetQueueStatsCollectors[key].Report());