From 6aa5d3904d71c4be21e5991d9ba82dff3c1cf51f Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 22 Apr 2009 00:48:56 +0000 Subject: Add copyright headers. Formatting cleanup. --- OpenSim/Framework/Statistics/BaseStatsCollector.cs | 10 +-- .../Statistics/Interfaces/IStatsCollector.cs | 16 ++--- .../Framework/Statistics/SimExtraStatsCollector.cs | 71 +++++++++++----------- 3 files changed, 48 insertions(+), 49 deletions(-) (limited to 'OpenSim/Framework/Statistics') 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 return sb.ToString(); } - - public virtual string XReport() - { - return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ; - } + + public virtual string XReport() + { + return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ; + } } } 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 /// /// string Report(); - - /// - /// Report back collected statistical information in json - /// - /// - /// A - /// - string XReport(); + + /// + /// Report back collected statistical information in json + /// + /// + /// A + /// + string XReport(); } } 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, return sb.ToString(); } - - + /// /// Report back collected statistical information. /// /// public override string XReport() { - OSDMap args = new OSDMap(28); - args["AssetsInCache"] = OSD.FromReal(AssetsInCache); - args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0); - args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests); - args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures); + OSDMap args = new OSDMap(28); + args["AssetsInCache"] = OSD.FromReal(AssetsInCache); + args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0); + args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests); + args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures); args["abnormalClientThreadTerminations"] = OSD.FromReal(abnormalClientThreadTerminations); - args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures); - args["Dilatn"] = OSD.FromReal(timeDilation); - args["SimFPS"] = OSD.FromReal(simFps); - args["PhyFPS"] = OSD.FromReal(physicsFps); - args["AgntUp"] = OSD.FromReal(agentUpdates); - args["RootAg"] = OSD.FromReal(rootAgents); - args["ChldAg"] = OSD.FromReal(childAgents); - args["Prims"] = OSD.FromReal(totalPrims); - args["AtvPrm"] = OSD.FromReal(activePrims); - args["AtvScr"] = OSD.FromReal(activeScripts); - args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond); - args["PktsIn"] = OSD.FromReal(inPacketsPerSecond); - args["PktOut"] = OSD.FromReal(outPacketsPerSecond); - args["PendDl"] = OSD.FromReal(pendingDownloads); - args["PendUl"] = OSD.FromReal(pendingUploads); - args["UnackB"] = OSD.FromReal(unackedBytes); - args["TotlFt"] = OSD.FromReal(totalFrameTime); - args["NetFt"] = OSD.FromReal(netFrameTime); - args["PhysFt"] = OSD.FromReal(physicsFrameTime); - args["OthrFt"] = OSD.FromReal(otherFrameTime); + args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures); + args["Dilatn"] = OSD.FromReal(timeDilation); + args["SimFPS"] = OSD.FromReal(simFps); + args["PhyFPS"] = OSD.FromReal(physicsFps); + args["AgntUp"] = OSD.FromReal(agentUpdates); + args["RootAg"] = OSD.FromReal(rootAgents); + args["ChldAg"] = OSD.FromReal(childAgents); + args["Prims"] = OSD.FromReal(totalPrims); + args["AtvPrm"] = OSD.FromReal(activePrims); + args["AtvScr"] = OSD.FromReal(activeScripts); + args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond); + args["PktsIn"] = OSD.FromReal(inPacketsPerSecond); + args["PktOut"] = OSD.FromReal(outPacketsPerSecond); + args["PendDl"] = OSD.FromReal(pendingDownloads); + args["PendUl"] = OSD.FromReal(pendingUploads); + args["UnackB"] = OSD.FromReal(unackedBytes); + args["TotlFt"] = OSD.FromReal(totalFrameTime); + args["NetFt"] = OSD.FromReal(netFrameTime); + args["PhysFt"] = OSD.FromReal(physicsFrameTime); + args["OthrFt"] = OSD.FromReal(otherFrameTime); args["AgntFt"] = OSD.FromReal(agentFrameTime); - args["ImgsFt"] = OSD.FromReal(imageFrameTime); - args["Memory"] = OSD.FromString(base.XReport()); - - string strBuffer = ""; + args["ImgsFt"] = OSD.FromReal(imageFrameTime); + args["Memory"] = OSD.FromString(base.XReport()); + + string strBuffer = ""; byte[] buffer = new byte[1]; strBuffer = OSDParser.SerializeJsonString(args); @@ -452,10 +451,10 @@ Asset service request failures: {3}" + Environment.NewLine, { return m_statsProvider.GetStats(); } - - public string XReport() - { - return ""; - } + + public string XReport() + { + return ""; + } } } -- cgit v1.1