diff options
author | Jeff Ames | 2008-08-18 00:39:10 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-18 00:39:10 +0000 |
commit | 6ef9d4da901a346c232458317cca6268da888e2e (patch) | |
tree | dd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Framework/Statistics/SimExtraStatsCollector.cs | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.zip opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2 opensim-SC-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Statistics/SimExtraStatsCollector.cs')
-rw-r--r-- | OpenSim/Framework/Statistics/SimExtraStatsCollector.cs | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs index 06b3185..58d5621 100644 --- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Statistics | |||
40 | public class SimExtraStatsCollector : BaseStatsCollector | 40 | public class SimExtraStatsCollector : BaseStatsCollector |
41 | { | 41 | { |
42 | private long abnormalClientThreadTerminations; | 42 | private long abnormalClientThreadTerminations; |
43 | 43 | ||
44 | private long assetsInCache; | 44 | private long assetsInCache; |
45 | private long texturesInCache; | 45 | private long texturesInCache; |
46 | private long assetCacheMemoryUsage; | 46 | private long assetCacheMemoryUsage; |
@@ -49,7 +49,7 @@ namespace OpenSim.Framework.Statistics | |||
49 | 49 | ||
50 | private long assetServiceRequestFailures; | 50 | private long assetServiceRequestFailures; |
51 | private long inventoryServiceRetrievalFailures; | 51 | private long inventoryServiceRetrievalFailures; |
52 | 52 | ||
53 | private float timeDilation; | 53 | private float timeDilation; |
54 | private float simFps; | 54 | private float simFps; |
55 | private float physicsFps; | 55 | private float physicsFps; |
@@ -70,8 +70,8 @@ namespace OpenSim.Framework.Statistics | |||
70 | private float pendingDownloads; | 70 | private float pendingDownloads; |
71 | private float pendingUploads; | 71 | private float pendingUploads; |
72 | private float activeScripts; | 72 | private float activeScripts; |
73 | private float scriptLinesPerSecond; | 73 | private float scriptLinesPerSecond; |
74 | 74 | ||
75 | /// <summary> | 75 | /// <summary> |
76 | /// Number of times that a client thread terminated because of an exception | 76 | /// Number of times that a client thread terminated because of an exception |
77 | /// </summary> | 77 | /// </summary> |
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Statistics | |||
79 | 79 | ||
80 | /// <summary> | 80 | /// <summary> |
81 | /// These statistics are being collected by push rather than pull. Pull would be simpler, but I had the | 81 | /// These statistics are being collected by push rather than pull. Pull would be simpler, but I had the |
82 | /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these | 82 | /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these |
83 | /// haven't yet been implemented... :) | 83 | /// haven't yet been implemented... :) |
84 | /// </summary> | 84 | /// </summary> |
85 | public long AssetsInCache { get { return assetsInCache; } } | 85 | public long AssetsInCache { get { return assetsInCache; } } |
@@ -101,19 +101,19 @@ namespace OpenSim.Framework.Statistics | |||
101 | /// as a failure | 101 | /// as a failure |
102 | /// </summary> | 102 | /// </summary> |
103 | public long AssetServiceRequestFailures { get { return assetServiceRequestFailures; } } | 103 | public long AssetServiceRequestFailures { get { return assetServiceRequestFailures; } } |
104 | 104 | ||
105 | /// <summary> | 105 | /// <summary> |
106 | /// Number of known failures to retrieve avatar inventory from the inventory service. This does not | 106 | /// Number of known failures to retrieve avatar inventory from the inventory service. This does not |
107 | /// cover situations where the inventory service accepts the request but never returns any data, since | 107 | /// cover situations where the inventory service accepts the request but never returns any data, since |
108 | /// we do not yet timeout this situation. | 108 | /// we do not yet timeout this situation. |
109 | /// </summary> | 109 | /// </summary> |
110 | public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } } | 110 | public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } } |
111 | 111 | ||
112 | /// <summary> | 112 | /// <summary> |
113 | /// Retrieve the total frame time (in ms) of the last frame | 113 | /// Retrieve the total frame time (in ms) of the last frame |
114 | /// </summary> | 114 | /// </summary> |
115 | //public float TotalFrameTime { get { return totalFrameTime; } } | 115 | //public float TotalFrameTime { get { return totalFrameTime; } } |
116 | 116 | ||
117 | /// <summary> | 117 | /// <summary> |
118 | /// Retrieve the physics update component (in ms) of the last frame | 118 | /// Retrieve the physics update component (in ms) of the last frame |
119 | /// </summary> | 119 | /// </summary> |
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Statistics | |||
124 | /// </summary> | 124 | /// </summary> |
125 | private IDictionary<LLUUID, PacketQueueStatsCollector> packetQueueStatsCollectors | 125 | private IDictionary<LLUUID, PacketQueueStatsCollector> packetQueueStatsCollectors |
126 | = new Dictionary<LLUUID, PacketQueueStatsCollector>(); | 126 | = new Dictionary<LLUUID, PacketQueueStatsCollector>(); |
127 | 127 | ||
128 | public void AddAbnormalClientThreadTermination() | 128 | public void AddAbnormalClientThreadTermination() |
129 | { | 129 | { |
130 | abnormalClientThreadTerminations++; | 130 | abnormalClientThreadTerminations++; |
@@ -146,7 +146,7 @@ namespace OpenSim.Framework.Statistics | |||
146 | textureCacheMemoryUsage += image.Data.Length; | 146 | textureCacheMemoryUsage += image.Data.Length; |
147 | } | 147 | } |
148 | } | 148 | } |
149 | 149 | ||
150 | /// <summary> | 150 | /// <summary> |
151 | /// Signal that the asset cache can be cleared. | 151 | /// Signal that the asset cache can be cleared. |
152 | /// </summary> | 152 | /// </summary> |
@@ -167,7 +167,7 @@ namespace OpenSim.Framework.Statistics | |||
167 | { | 167 | { |
168 | assetServiceRequestFailures++; | 168 | assetServiceRequestFailures++; |
169 | } | 169 | } |
170 | 170 | ||
171 | public void AddInventoryServiceRetrievalFailure() | 171 | public void AddInventoryServiceRetrievalFailure() |
172 | { | 172 | { |
173 | inventoryServiceRetrievalFailures++; | 173 | inventoryServiceRetrievalFailures++; |
@@ -199,18 +199,18 @@ namespace OpenSim.Framework.Statistics | |||
199 | packetQueueStatsCollectors.Remove(uuid); | 199 | packetQueueStatsCollectors.Remove(uuid); |
200 | } | 200 | } |
201 | } | 201 | } |
202 | 202 | ||
203 | /// <summary> | 203 | /// <summary> |
204 | /// This is the method on which the classic sim stats reporter (which collects stats for | 204 | /// This is the method on which the classic sim stats reporter (which collects stats for |
205 | /// client purposes) sends information to listeners. | 205 | /// client purposes) sends information to listeners. |
206 | /// </summary> | 206 | /// </summary> |
207 | /// <param name="pack"></param> | 207 | /// <param name="pack"></param> |
208 | public void ReceiveClassicSimStatsPacket(SimStatsPacket statsPacket) | 208 | public void ReceiveClassicSimStatsPacket(SimStatsPacket statsPacket) |
209 | { | 209 | { |
210 | // FIXME: Really shouldn't rely on the probably arbitrary order in which | 210 | // FIXME: Really shouldn't rely on the probably arbitrary order in which |
211 | // stats are packed into the packet | 211 | // stats are packed into the packet |
212 | timeDilation = statsPacket.Stat[0].StatValue; | 212 | timeDilation = statsPacket.Stat[0].StatValue; |
213 | simFps = statsPacket.Stat[1].StatValue; | 213 | simFps = statsPacket.Stat[1].StatValue; |
214 | physicsFps = statsPacket.Stat[2].StatValue; | 214 | physicsFps = statsPacket.Stat[2].StatValue; |
215 | agentUpdates = statsPacket.Stat[3].StatValue; | 215 | agentUpdates = statsPacket.Stat[3].StatValue; |
216 | rootAgents = statsPacket.Stat[4].StatValue; | 216 | rootAgents = statsPacket.Stat[4].StatValue; |
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Statistics | |||
231 | activeScripts = statsPacket.Stat[19].StatValue; | 231 | activeScripts = statsPacket.Stat[19].StatValue; |
232 | scriptLinesPerSecond = statsPacket.Stat[20].StatValue; | 232 | scriptLinesPerSecond = statsPacket.Stat[20].StatValue; |
233 | } | 233 | } |
234 | 234 | ||
235 | /// <summary> | 235 | /// <summary> |
236 | /// Report back collected statistical information. | 236 | /// Report back collected statistical information. |
237 | /// </summary> | 237 | /// </summary> |
@@ -248,10 +248,10 @@ Texture cache contains {2,6} texture assets using {3,10} K | |||
248 | Blocked client requests for missing textures: {4} | 248 | Blocked client requests for missing textures: {4} |
249 | Asset service request failures: {5}"+ Environment.NewLine, | 249 | Asset service request failures: {5}"+ Environment.NewLine, |
250 | AssetsInCache, Math.Round(AssetCacheMemoryUsage / 1024.0), | 250 | AssetsInCache, Math.Round(AssetCacheMemoryUsage / 1024.0), |
251 | TexturesInCache, Math.Round(TextureCacheMemoryUsage / 1024.0), | 251 | TexturesInCache, Math.Round(TextureCacheMemoryUsage / 1024.0), |
252 | BlockedMissingTextureRequests, | 252 | BlockedMissingTextureRequests, |
253 | AssetServiceRequestFailures)); | 253 | AssetServiceRequestFailures)); |
254 | 254 | ||
255 | sb.Append(Environment.NewLine); | 255 | sb.Append(Environment.NewLine); |
256 | sb.Append("CONNECTION STATISTICS"); | 256 | sb.Append("CONNECTION STATISTICS"); |
257 | sb.Append(Environment.NewLine); | 257 | sb.Append(Environment.NewLine); |
@@ -267,7 +267,7 @@ Asset service request failures: {5}"+ Environment.NewLine, | |||
267 | string.Format( | 267 | string.Format( |
268 | "Initial inventory caching failures: {0}" + Environment.NewLine, | 268 | "Initial inventory caching failures: {0}" + Environment.NewLine, |
269 | InventoryServiceRetrievalFailures)); | 269 | InventoryServiceRetrievalFailures)); |
270 | 270 | ||
271 | sb.Append(Environment.NewLine); | 271 | sb.Append(Environment.NewLine); |
272 | sb.Append("FRAME STATISTICS"); | 272 | sb.Append("FRAME STATISTICS"); |
273 | sb.Append(Environment.NewLine); | 273 | sb.Append(Environment.NewLine); |
@@ -278,18 +278,18 @@ Asset service request failures: {5}"+ Environment.NewLine, | |||
278 | "{0,6:0.00} {1,6:0} {2,6:0.0} {3,6:0.0} {4,6:0} {5,6:0} {6,6:0} {7,6:0} {8,6:0} {9,6:0}", | 278 | "{0,6:0.00} {1,6:0} {2,6:0.0} {3,6:0.0} {4,6:0} {5,6:0} {6,6:0} {7,6:0} {8,6:0} {9,6:0}", |
279 | timeDilation, simFps, physicsFps, agentUpdates, rootAgents, | 279 | timeDilation, simFps, physicsFps, agentUpdates, rootAgents, |
280 | childAgents, totalPrims, activePrims, activeScripts, scriptLinesPerSecond)); | 280 | childAgents, totalPrims, activePrims, activeScripts, scriptLinesPerSecond)); |
281 | 281 | ||
282 | sb.Append(Environment.NewLine); | 282 | sb.Append(Environment.NewLine); |
283 | sb.Append(Environment.NewLine); | 283 | sb.Append(Environment.NewLine); |
284 | // There is no script frame time currently because we don't yet collect it | 284 | // There is no script frame time currently because we don't yet collect it |
285 | sb.Append("PktsIn PktOut PendDl PendUl UnackB TotlFt NetFt PhysFt OthrFt AgntFt ImgsFt"); | 285 | sb.Append("PktsIn PktOut PendDl PendUl UnackB TotlFt NetFt PhysFt OthrFt AgntFt ImgsFt"); |
286 | sb.Append(Environment.NewLine); | 286 | sb.Append(Environment.NewLine); |
287 | sb.Append( | 287 | sb.Append( |
288 | string.Format( | 288 | string.Format( |
289 | "{0,6:0} {1,6:0} {2,6:0} {3,6:0} {4,6:0} {5,6:0.0} {6,6:0.0} {7,6:0.0} {8,6:0.0} {9,6:0.0} {10,6:0.0}", | 289 | "{0,6:0} {1,6:0} {2,6:0} {3,6:0} {4,6:0} {5,6:0.0} {6,6:0.0} {7,6:0.0} {8,6:0.0} {9,6:0.0} {10,6:0.0}", |
290 | inPacketsPerSecond, outPacketsPerSecond, pendingDownloads, pendingUploads, unackedBytes, totalFrameTime, | 290 | inPacketsPerSecond, outPacketsPerSecond, pendingDownloads, pendingUploads, unackedBytes, totalFrameTime, |
291 | netFrameTime, physicsFrameTime, otherFrameTime, agentFrameTime, imageFrameTime)); | 291 | netFrameTime, physicsFrameTime, otherFrameTime, agentFrameTime, imageFrameTime)); |
292 | sb.Append(Environment.NewLine); | 292 | sb.Append(Environment.NewLine); |
293 | 293 | ||
294 | /* | 294 | /* |
295 | sb.Append(Environment.NewLine); | 295 | sb.Append(Environment.NewLine); |
@@ -311,7 +311,7 @@ Asset service request failures: {5}"+ Environment.NewLine, | |||
311 | */ | 311 | */ |
312 | 312 | ||
313 | sb.Append(base.Report()); | 313 | sb.Append(base.Report()); |
314 | 314 | ||
315 | return sb.ToString(); | 315 | return sb.ToString(); |
316 | } | 316 | } |
317 | } | 317 | } |