ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Thanks Bluewall for Mantis #3519: a patch that adds simulator uptime and version to REST/json statistics reporting

Browse Source
This commit is contained in:
Dahlia Trimble
2009-04-25 05:06:01 +00:00
parent 917849eaac
commit 4792e6139a
6 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Statistics/BaseStatsCollector.cs
View File

@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Statistics
return sb.ToString();
}
public virtual string XReport()
public virtual string XReport(string uptime, string version)
{
return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
}

2
OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs
View File

@@ -44,6 +44,6 @@ namespace OpenSim.Framework.Statistics
/// <returns>
/// A <see cref="System.String"/>
/// </returns>
string XReport();
string XReport(string uptime, string version);
}
}

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

@@ -384,12 +384,12 @@ Asset service request failures: {3}" + Environment.NewLine,
}
/// <summary>
/// Report back collected statistical information.
/// Report back collected statistical information as json serialization.
/// </summary>
/// <returns></returns>
public override string XReport()
public override string XReport(string uptime, string version)
{
OSDMap args = new OSDMap(28);
OSDMap args = new OSDMap(30);
args["AssetsInCache"] = OSD.FromReal(AssetsInCache);
args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0);
args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests);
@@ -417,14 +417,12 @@ Asset service request failures: {3}" + Environment.NewLine,
args["OthrFt"] = OSD.FromReal(otherFrameTime);
args["AgntFt"] = OSD.FromReal(agentFrameTime);
args["ImgsFt"] = OSD.FromReal(imageFrameTime);
args["Memory"] = OSD.FromString(base.XReport());
args["Memory"] = OSD.FromString(base.XReport(uptime, version));
args["Uptime"] = OSD.FromString(uptime);
args["Version"] = OSD.FromString(version);
string strBuffer = "";
// byte[] buffer = new byte[1];
strBuffer = OSDParser.SerializeJsonString(args);
// UTF8Encoding str = new UTF8Encoding();
// buffer = str.GetBytes(strBuffer);
return strBuffer;
}
@@ -451,7 +449,7 @@ Asset service request failures: {3}" + Environment.NewLine,
return m_statsProvider.GetStats();
}
public string XReport()
public string XReport(string uptime, string version)
{
return "";
}