diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs')
-rwxr-xr-x | OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs index 08c2409..88a0297 100755 --- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs | |||
@@ -90,17 +90,17 @@ namespace OpenSim.Framework.Monitoring | |||
90 | // /// haven't yet been implemented... | 90 | // /// haven't yet been implemented... |
91 | // /// </summary> | 91 | // /// </summary> |
92 | // public long AssetsInCache { get { return assetsInCache; } } | 92 | // public long AssetsInCache { get { return assetsInCache; } } |
93 | // | 93 | // |
94 | // /// <value> | 94 | // /// <value> |
95 | // /// Currently unused | 95 | // /// Currently unused |
96 | // /// </value> | 96 | // /// </value> |
97 | // public long TexturesInCache { get { return texturesInCache; } } | 97 | // public long TexturesInCache { get { return texturesInCache; } } |
98 | // | 98 | // |
99 | // /// <value> | 99 | // /// <value> |
100 | // /// Currently misleading since we can't currently subtract removed asset memory usage without a performance hit | 100 | // /// Currently misleading since we can't currently subtract removed asset memory usage without a performance hit |
101 | // /// </value> | 101 | // /// </value> |
102 | // public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } } | 102 | // public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } } |
103 | // | 103 | // |
104 | // /// <value> | 104 | // /// <value> |
105 | // /// Currently unused | 105 | // /// Currently unused |
106 | // /// </value> | 106 | // /// </value> |
@@ -127,7 +127,7 @@ namespace OpenSim.Framework.Monitoring | |||
127 | public float PendingUploads { get { return pendingUploads; } } | 127 | public float PendingUploads { get { return pendingUploads; } } |
128 | public float ActiveScripts { get { return activeScripts; } } | 128 | public float ActiveScripts { get { return activeScripts; } } |
129 | public float ScriptLinesPerSecond { get { return scriptLinesPerSecond; } } | 129 | public float ScriptLinesPerSecond { get { return scriptLinesPerSecond; } } |
130 | 130 | ||
131 | // /// <summary> | 131 | // /// <summary> |
132 | // /// This is the time it took for the last asset request made in response to a cache miss. | 132 | // /// This is the time it took for the last asset request made in response to a cache miss. |
133 | // /// </summary> | 133 | // /// </summary> |
@@ -177,7 +177,7 @@ namespace OpenSim.Framework.Monitoring | |||
177 | // assetsInCache++; | 177 | // assetsInCache++; |
178 | // //assetCacheMemoryUsage += asset.Data.Length; | 178 | // //assetCacheMemoryUsage += asset.Data.Length; |
179 | // } | 179 | // } |
180 | // | 180 | // |
181 | // public void RemoveAsset(UUID uuid) | 181 | // public void RemoveAsset(UUID uuid) |
182 | // { | 182 | // { |
183 | // assetsInCache--; | 183 | // assetsInCache--; |
@@ -204,7 +204,7 @@ namespace OpenSim.Framework.Monitoring | |||
204 | // texturesInCache = 0; | 204 | // texturesInCache = 0; |
205 | // textureCacheMemoryUsage = 0; | 205 | // textureCacheMemoryUsage = 0; |
206 | // } | 206 | // } |
207 | // | 207 | // |
208 | // public void AddAssetRequestTimeAfterCacheMiss(TimeSpan ts) | 208 | // public void AddAssetRequestTimeAfterCacheMiss(TimeSpan ts) |
209 | // { | 209 | // { |
210 | // assetRequestTimeAfterCacheMiss = ts; | 210 | // assetRequestTimeAfterCacheMiss = ts; |
@@ -306,7 +306,7 @@ namespace OpenSim.Framework.Monitoring | |||
306 | StringBuilder sb = new StringBuilder(Environment.NewLine); | 306 | StringBuilder sb = new StringBuilder(Environment.NewLine); |
307 | // sb.Append("ASSET STATISTICS"); | 307 | // sb.Append("ASSET STATISTICS"); |
308 | // sb.Append(Environment.NewLine); | 308 | // sb.Append(Environment.NewLine); |
309 | 309 | ||
310 | /* | 310 | /* |
311 | sb.Append( | 311 | sb.Append( |
312 | string.Format( | 312 | string.Format( |
@@ -342,7 +342,7 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
342 | List<Stat> stats = StatsManager.GetStatsFromEachContainer("clientstack", "ClientLogoutsDueToNoReceives"); | 342 | List<Stat> stats = StatsManager.GetStatsFromEachContainer("clientstack", "ClientLogoutsDueToNoReceives"); |
343 | 343 | ||
344 | sb.AppendFormat( | 344 | sb.AppendFormat( |
345 | "Client logouts due to no data receive timeout: {0}\n\n", | 345 | "Client logouts due to no data receive timeout: {0}\n\n", |
346 | stats != null ? stats.Sum(s => s.Value).ToString() : "unknown"); | 346 | stats != null ? stats.Sum(s => s.Value).ToString() : "unknown"); |
347 | 347 | ||
348 | // sb.Append(Environment.NewLine); | 348 | // sb.Append(Environment.NewLine); |
@@ -443,10 +443,10 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
443 | foreach (ProcessThread currentThread in | 443 | foreach (ProcessThread currentThread in |
444 | Process.GetCurrentProcess().Threads) | 444 | Process.GetCurrentProcess().Threads) |
445 | { | 445 | { |
446 | // A known issue with the current process .Threads property is | 446 | // A known issue with the current process .Threads property is |
447 | // that it can return null threads, thus don't count those as | 447 | // that it can return null threads, thus don't count those as |
448 | // running threads and prevent the program function from failing | 448 | // running threads and prevent the program function from failing |
449 | if (currentThread != null && | 449 | if (currentThread != null && |
450 | currentThread.ThreadState == ThreadState.Running) | 450 | currentThread.ThreadState == ThreadState.Running) |
451 | { | 451 | { |
452 | numberThreadsRunning++; | 452 | numberThreadsRunning++; |
@@ -505,7 +505,7 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
505 | "{0:0.##}", numberThreadsRunning)); | 505 | "{0:0.##}", numberThreadsRunning)); |
506 | args["ProcMem"] = OSD.FromString(String.Format("{0:#,###,###.##}", | 506 | args["ProcMem"] = OSD.FromString(String.Format("{0:#,###,###.##}", |
507 | memUsage)); | 507 | memUsage)); |
508 | 508 | ||
509 | return args; | 509 | return args; |
510 | } | 510 | } |
511 | } | 511 | } |
@@ -531,12 +531,12 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
531 | { | 531 | { |
532 | return m_statsProvider.GetStats(); | 532 | return m_statsProvider.GetStats(); |
533 | } | 533 | } |
534 | 534 | ||
535 | public string XReport(string uptime, string version) | 535 | public string XReport(string uptime, string version) |
536 | { | 536 | { |
537 | return ""; | 537 | return ""; |
538 | } | 538 | } |
539 | 539 | ||
540 | public OSDMap OReport(string uptime, string version) | 540 | public OSDMap OReport(string uptime, string version) |
541 | { | 541 | { |
542 | OSDMap ret = new OSDMap(); | 542 | OSDMap ret = new OSDMap(); |