diff options
author | Jeff Ames | 2009-04-22 00:48:56 +0000 |
---|---|---|
committer | Jeff Ames | 2009-04-22 00:48:56 +0000 |
commit | 6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f (patch) | |
tree | 55509d75eca81eb3b463984a1981c3a4d4fcce54 /OpenSim/Framework/Statistics | |
parent | Thank you kindly, MCortez, for a patch that: (diff) | |
download | opensim-SC_OLD-6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f.zip opensim-SC_OLD-6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f.tar.gz opensim-SC_OLD-6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f.tar.bz2 opensim-SC_OLD-6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f.tar.xz |
Add copyright headers. Formatting cleanup.
Diffstat (limited to '')
3 files changed, 48 insertions, 49 deletions
diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Statistics/BaseStatsCollector.cs index a5ce8aa..ca0907d 100644 --- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs +++ b/OpenSim/Framework/Statistics/BaseStatsCollector.cs | |||
@@ -51,10 +51,10 @@ namespace OpenSim.Framework.Statistics | |||
51 | 51 | ||
52 | return sb.ToString(); | 52 | return sb.ToString(); |
53 | } | 53 | } |
54 | 54 | ||
55 | public virtual string XReport() | 55 | public virtual string XReport() |
56 | { | 56 | { |
57 | return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ; | 57 | return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ; |
58 | } | 58 | } |
59 | } | 59 | } |
60 | } | 60 | } |
diff --git a/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs b/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs index 48f28ee..ac8133d 100644 --- a/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs +++ b/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs | |||
@@ -37,13 +37,13 @@ namespace OpenSim.Framework.Statistics | |||
37 | /// </summary> | 37 | /// </summary> |
38 | /// <returns></returns> | 38 | /// <returns></returns> |
39 | string Report(); | 39 | string Report(); |
40 | 40 | ||
41 | /// <summary> | 41 | /// <summary> |
42 | /// Report back collected statistical information in json | 42 | /// Report back collected statistical information in json |
43 | /// </summary> | 43 | /// </summary> |
44 | /// <returns> | 44 | /// <returns> |
45 | /// A <see cref="System.String"/> | 45 | /// A <see cref="System.String"/> |
46 | /// </returns> | 46 | /// </returns> |
47 | string XReport(); | 47 | string XReport(); |
48 | } | 48 | } |
49 | } | 49 | } |
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs index 8b8b52a..d3513fc 100644 --- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs | |||
@@ -383,45 +383,44 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
383 | 383 | ||
384 | return sb.ToString(); | 384 | return sb.ToString(); |
385 | } | 385 | } |
386 | 386 | ||
387 | |||
388 | /// <summary> | 387 | /// <summary> |
389 | /// Report back collected statistical information. | 388 | /// Report back collected statistical information. |
390 | /// </summary> | 389 | /// </summary> |
391 | /// <returns></returns> | 390 | /// <returns></returns> |
392 | public override string XReport() | 391 | public override string XReport() |
393 | { | 392 | { |
394 | OSDMap args = new OSDMap(28); | 393 | OSDMap args = new OSDMap(28); |
395 | args["AssetsInCache"] = OSD.FromReal(AssetsInCache); | 394 | args["AssetsInCache"] = OSD.FromReal(AssetsInCache); |
396 | args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0); | 395 | args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0); |
397 | args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests); | 396 | args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests); |
398 | args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures); | 397 | args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures); |
399 | args["abnormalClientThreadTerminations"] = OSD.FromReal(abnormalClientThreadTerminations); | 398 | args["abnormalClientThreadTerminations"] = OSD.FromReal(abnormalClientThreadTerminations); |
400 | args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures); | 399 | args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures); |
401 | args["Dilatn"] = OSD.FromReal(timeDilation); | 400 | args["Dilatn"] = OSD.FromReal(timeDilation); |
402 | args["SimFPS"] = OSD.FromReal(simFps); | 401 | args["SimFPS"] = OSD.FromReal(simFps); |
403 | args["PhyFPS"] = OSD.FromReal(physicsFps); | 402 | args["PhyFPS"] = OSD.FromReal(physicsFps); |
404 | args["AgntUp"] = OSD.FromReal(agentUpdates); | 403 | args["AgntUp"] = OSD.FromReal(agentUpdates); |
405 | args["RootAg"] = OSD.FromReal(rootAgents); | 404 | args["RootAg"] = OSD.FromReal(rootAgents); |
406 | args["ChldAg"] = OSD.FromReal(childAgents); | 405 | args["ChldAg"] = OSD.FromReal(childAgents); |
407 | args["Prims"] = OSD.FromReal(totalPrims); | 406 | args["Prims"] = OSD.FromReal(totalPrims); |
408 | args["AtvPrm"] = OSD.FromReal(activePrims); | 407 | args["AtvPrm"] = OSD.FromReal(activePrims); |
409 | args["AtvScr"] = OSD.FromReal(activeScripts); | 408 | args["AtvScr"] = OSD.FromReal(activeScripts); |
410 | args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond); | 409 | args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond); |
411 | args["PktsIn"] = OSD.FromReal(inPacketsPerSecond); | 410 | args["PktsIn"] = OSD.FromReal(inPacketsPerSecond); |
412 | args["PktOut"] = OSD.FromReal(outPacketsPerSecond); | 411 | args["PktOut"] = OSD.FromReal(outPacketsPerSecond); |
413 | args["PendDl"] = OSD.FromReal(pendingDownloads); | 412 | args["PendDl"] = OSD.FromReal(pendingDownloads); |
414 | args["PendUl"] = OSD.FromReal(pendingUploads); | 413 | args["PendUl"] = OSD.FromReal(pendingUploads); |
415 | args["UnackB"] = OSD.FromReal(unackedBytes); | 414 | args["UnackB"] = OSD.FromReal(unackedBytes); |
416 | args["TotlFt"] = OSD.FromReal(totalFrameTime); | 415 | args["TotlFt"] = OSD.FromReal(totalFrameTime); |
417 | args["NetFt"] = OSD.FromReal(netFrameTime); | 416 | args["NetFt"] = OSD.FromReal(netFrameTime); |
418 | args["PhysFt"] = OSD.FromReal(physicsFrameTime); | 417 | args["PhysFt"] = OSD.FromReal(physicsFrameTime); |
419 | args["OthrFt"] = OSD.FromReal(otherFrameTime); | 418 | args["OthrFt"] = OSD.FromReal(otherFrameTime); |
420 | args["AgntFt"] = OSD.FromReal(agentFrameTime); | 419 | args["AgntFt"] = OSD.FromReal(agentFrameTime); |
421 | args["ImgsFt"] = OSD.FromReal(imageFrameTime); | 420 | args["ImgsFt"] = OSD.FromReal(imageFrameTime); |
422 | args["Memory"] = OSD.FromString(base.XReport()); | 421 | args["Memory"] = OSD.FromString(base.XReport()); |
423 | 422 | ||
424 | string strBuffer = ""; | 423 | string strBuffer = ""; |
425 | byte[] buffer = new byte[1]; | 424 | byte[] buffer = new byte[1]; |
426 | 425 | ||
427 | strBuffer = OSDParser.SerializeJsonString(args); | 426 | strBuffer = OSDParser.SerializeJsonString(args); |
@@ -452,10 +451,10 @@ Asset service request failures: {3}" + Environment.NewLine, | |||
452 | { | 451 | { |
453 | return m_statsProvider.GetStats(); | 452 | return m_statsProvider.GetStats(); |
454 | } | 453 | } |
455 | 454 | ||
456 | public string XReport() | 455 | public string XReport() |
457 | { | 456 | { |
458 | return ""; | 457 | return ""; |
459 | } | 458 | } |
460 | } | 459 | } |
461 | } | 460 | } |