OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix XStats formatting: 

Recent libomv update broke the json serialization for
	XStats. This uses String.Format to convert all data to
	strings with fixed decimal (2 places ), or integer formats
	as appropriate.
prebuild-update
BlueWall (James Hughes) 2010-08-03 01:49:27 -04:00 committed by Justin Clark-Casey (justincc)
parent 1cffeab99d
commit 85d7d0583e
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
View File

@ -390,36 +390,41 @@ Asset service request failures: {3}" + Environment.NewLine,
public override string XReport(string uptime, string version) public override string XReport(string uptime, string version)
{ {
OSDMap args = new OSDMap(30); OSDMap args = new OSDMap(30);
args["AssetsInCache"] = OSD.FromReal(AssetsInCache); args["AssetsInCache"] = OSD.FromString (String.Format ("{0:0.##}", AssetsInCache));
args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0); args["TimeAfterCacheMiss"] = OSD.FromString (String.Format ("{0:0.##}",
args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests); assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0));
args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures); args["BlockedMissingTextureRequests"] = OSD.FromString (String.Format ("{0:0.##}",
args["abnormalClientThreadTerminations"] = OSD.FromReal(abnormalClientThreadTerminations); BlockedMissingTextureRequests));
args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures); args["AssetServiceRequestFailures"] = OSD.FromString (String.Format ("{0:0.##}",
args["Dilatn"] = OSD.FromReal(timeDilation); AssetServiceRequestFailures));
args["SimFPS"] = OSD.FromReal(simFps); args["abnormalClientThreadTerminations"] = OSD.FromString (String.Format ("{0:0.##}",
args["PhyFPS"] = OSD.FromReal(physicsFps); abnormalClientThreadTerminations));
args["AgntUp"] = OSD.FromReal(agentUpdates); args["InventoryServiceRetrievalFailures"] = OSD.FromString (String.Format ("{0:0.##}",
args["RootAg"] = OSD.FromReal(rootAgents); InventoryServiceRetrievalFailures));
args["ChldAg"] = OSD.FromReal(childAgents); args["Dilatn"] = OSD.FromString (String.Format ("{0:0.##}", timeDilation));
args["Prims"] = OSD.FromReal(totalPrims); args["SimFPS"] = OSD.FromString (String.Format ("{0:0.##}", simFps));
args["AtvPrm"] = OSD.FromReal(activePrims); args["PhyFPS"] = OSD.FromString (String.Format ("{0:0.##}", physicsFps));
args["AtvScr"] = OSD.FromReal(activeScripts); args["AgntUp"] = OSD.FromString (String.Format ("{0:0.##}", agentUpdates));
args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond); args["RootAg"] = OSD.FromString (String.Format ("{0:0.##}", rootAgents));
args["PktsIn"] = OSD.FromReal(inPacketsPerSecond); args["ChldAg"] = OSD.FromString (String.Format ("{0:0.##}", childAgents));
args["PktOut"] = OSD.FromReal(outPacketsPerSecond); args["Prims"] = OSD.FromString (String.Format ("{0:0.##}", totalPrims));
args["PendDl"] = OSD.FromReal(pendingDownloads); args["AtvPrm"] = OSD.FromString (String.Format ("{0:0.##}", activePrims));
args["PendUl"] = OSD.FromReal(pendingUploads); args["AtvScr"] = OSD.FromString (String.Format ("{0:0.##}", activeScripts));
args["UnackB"] = OSD.FromReal(unackedBytes); args["ScrLPS"] = OSD.FromString (String.Format ("{0:0.##}", scriptLinesPerSecond));
args["TotlFt"] = OSD.FromReal(totalFrameTime); args["PktsIn"] = OSD.FromString (String.Format ("{0:0.##}", inPacketsPerSecond));
args["NetFt"] = OSD.FromReal(netFrameTime); args["PktOut"] = OSD.FromString (String.Format ("{0:0.##}", outPacketsPerSecond));
args["PhysFt"] = OSD.FromReal(physicsFrameTime); args["PendDl"] = OSD.FromString (String.Format ("{0:0.##}", pendingDownloads));
args["OthrFt"] = OSD.FromReal(otherFrameTime); args["PendUl"] = OSD.FromString (String.Format ("{0:0.##}", pendingUploads));
args["AgntFt"] = OSD.FromReal(agentFrameTime); args["UnackB"] = OSD.FromString (String.Format ("{0:0.##}", unackedBytes));
args["ImgsFt"] = OSD.FromReal(imageFrameTime); args["TotlFt"] = OSD.FromString (String.Format ("{0:0.##}", totalFrameTime));
args["Memory"] = OSD.FromString(base.XReport(uptime, version)); args["NetFt"] = OSD.FromString (String.Format ("{0:0.##}", netFrameTime));
args["Uptime"] = OSD.FromString(uptime); args["PhysFt"] = OSD.FromString (String.Format ("{0:0.##}", physicsFrameTime));
args["Version"] = OSD.FromString(version); args["OthrFt"] = OSD.FromString (String.Format ("{0:0.##}", otherFrameTime));
args["AgntFt"] = OSD.FromString (String.Format ("{0:0.##}", agentFrameTime));
args["ImgsFt"] = OSD.FromString (String.Format ("{0:0.##}", imageFrameTime));
args["Memory"] = OSD.FromString (base.XReport (uptime, version));
args["Uptime"] = OSD.FromString (uptime);
args["Version"] = OSD.FromString (version);
string strBuffer = ""; string strBuffer = "";
strBuffer = OSDParser.SerializeJsonString(args); strBuffer = OSDParser.SerializeJsonString(args);