aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsCollector.cs (renamed from OpenSim/Framework/Statistics/SimExtraStatsReporter.cs)25
1 files changed, 14 insertions, 11 deletions
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 567d8dd..4e69d17 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -33,7 +33,10 @@ using OpenSim.Framework.Statistics.Interfaces;
33 33
34namespace OpenSim.Framework.Statistics 34namespace OpenSim.Framework.Statistics
35{ 35{
36 public class SimExtraStatsReporter 36 /// <summary>
37 /// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane
38 /// </summary>
39 public class SimExtraStatsCollector
37 { 40 {
38 private long assetsInCache; 41 private long assetsInCache;
39 private long texturesInCache; 42 private long texturesInCache;
@@ -48,8 +51,8 @@ namespace OpenSim.Framework.Statistics
48 /// <summary> 51 /// <summary>
49 /// Retain a dictionary of all packet queues stats reporters 52 /// Retain a dictionary of all packet queues stats reporters
50 /// </summary> 53 /// </summary>
51 private IDictionary<LLUUID, PacketQueueStatsReporter> packetQueueStatsReporters 54 private IDictionary<LLUUID, PacketQueueStatsCollector> packetQueueStatsCollectors
52 = new Dictionary<LLUUID, PacketQueueStatsReporter>(); 55 = new Dictionary<LLUUID, PacketQueueStatsCollector>();
53 56
54 public void AddAsset(AssetBase asset) 57 public void AddAsset(AssetBase asset)
55 { 58 {
@@ -74,9 +77,9 @@ namespace OpenSim.Framework.Statistics
74 /// <param name="provider"></param> 77 /// <param name="provider"></param>
75 public void RegisterPacketQueueStatsProvider(LLUUID uuid, IPullStatsProvider provider) 78 public void RegisterPacketQueueStatsProvider(LLUUID uuid, IPullStatsProvider provider)
76 { 79 {
77 lock (packetQueueStatsReporters) 80 lock (packetQueueStatsCollectors)
78 { 81 {
79 packetQueueStatsReporters[uuid] = new PacketQueueStatsReporter(provider); 82 packetQueueStatsCollectors[uuid] = new PacketQueueStatsCollector(provider);
80 } 83 }
81 } 84 }
82 85
@@ -86,9 +89,9 @@ namespace OpenSim.Framework.Statistics
86 /// <param name="uuid">An agent LLUUID</param> 89 /// <param name="uuid">An agent LLUUID</param>
87 public void DeregisterPacketQueueStatsProvider(LLUUID uuid) 90 public void DeregisterPacketQueueStatsProvider(LLUUID uuid)
88 { 91 {
89 lock (packetQueueStatsReporters) 92 lock (packetQueueStatsCollectors)
90 { 93 {
91 packetQueueStatsReporters.Remove(uuid); 94 packetQueueStatsCollectors.Remove(uuid);
92 } 95 }
93 } 96 }
94 97
@@ -118,10 +121,10 @@ Texture cache contains {2,6} textures using {3,10:0.000}K" + Environment.NewLine
118 "Send", "In", "Out", "Resend", "Land", "Wind", "Cloud", "Task", "Texture", "Asset")); 121 "Send", "In", "Out", "Resend", "Land", "Wind", "Cloud", "Task", "Texture", "Asset"));
119 sb.Append(Environment.NewLine); 122 sb.Append(Environment.NewLine);
120 123
121 foreach (LLUUID key in packetQueueStatsReporters.Keys) 124 foreach (LLUUID key in packetQueueStatsCollectors.Keys)
122 { 125 {
123 sb.Append(string.Format("{0}: ", key)); 126 sb.Append(string.Format("{0}: ", key));
124 sb.Append(packetQueueStatsReporters[key].Report()); 127 sb.Append(packetQueueStatsCollectors[key].Report());
125 sb.Append(Environment.NewLine); 128 sb.Append(Environment.NewLine);
126 } 129 }
127 130
@@ -132,11 +135,11 @@ Texture cache contains {2,6} textures using {3,10:0.000}K" + Environment.NewLine
132 /// <summary> 135 /// <summary>
133 /// Pull packet queue stats from packet queues and report 136 /// Pull packet queue stats from packet queues and report
134 /// </summary> 137 /// </summary>
135 public class PacketQueueStatsReporter 138 public class PacketQueueStatsCollector
136 { 139 {
137 private IPullStatsProvider m_statsProvider; 140 private IPullStatsProvider m_statsProvider;
138 141
139 public PacketQueueStatsReporter(IPullStatsProvider provider) 142 public PacketQueueStatsCollector(IPullStatsProvider provider)
140 { 143 {
141 m_statsProvider = provider; 144 m_statsProvider = provider;
142 } 145 }