aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs')
-rwxr-xr-xOpenSim/Framework/Monitoring/SimExtraStatsCollector.cs19
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
index 98fa65a..432efdb 100755
--- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
@@ -72,6 +72,7 @@ namespace OpenSim.Framework.Monitoring
72 private volatile float pendingUploads; 72 private volatile float pendingUploads;
73 private volatile float activeScripts; 73 private volatile float activeScripts;
74 private volatile float scriptLinesPerSecond; 74 private volatile float scriptLinesPerSecond;
75 private volatile float m_frameDilation;
75 private volatile float m_usersLoggingIn; 76 private volatile float m_usersLoggingIn;
76 private volatile float m_totalGeoPrims; 77 private volatile float m_totalGeoPrims;
77 private volatile float m_totalMeshes; 78 private volatile float m_totalMeshes;
@@ -257,7 +258,7 @@ namespace OpenSim.Framework.Monitoring
257 258
258 // For an unknown reason the original designers decided not to 259 // For an unknown reason the original designers decided not to
259 // include the spare MS statistic inside of this class, this is 260 // include the spare MS statistic inside of this class, this is
260 // located inside the StatsBlock at location 21 thus it is skipped 261 // located inside the StatsBlock at location 21, thus it is skipped
261 timeDilation = stats.StatsBlock[0].StatValue; 262 timeDilation = stats.StatsBlock[0].StatValue;
262 simFps = stats.StatsBlock[1].StatValue; 263 simFps = stats.StatsBlock[1].StatValue;
263 physicsFps = stats.StatsBlock[2].StatValue; 264 physicsFps = stats.StatsBlock[2].StatValue;
@@ -279,10 +280,11 @@ namespace OpenSim.Framework.Monitoring
279 pendingUploads = stats.StatsBlock[18].StatValue; 280 pendingUploads = stats.StatsBlock[18].StatValue;
280 activeScripts = stats.StatsBlock[19].StatValue; 281 activeScripts = stats.StatsBlock[19].StatValue;
281 scriptLinesPerSecond = stats.StatsBlock[20].StatValue; 282 scriptLinesPerSecond = stats.StatsBlock[20].StatValue;
282 m_usersLoggingIn = stats.StatsBlock[22].StatValue; 283 m_frameDilation = stats.StatsBlock[22].StatValue;
283 m_totalGeoPrims = stats.StatsBlock[23].StatValue; 284 m_usersLoggingIn = stats.StatsBlock[23].StatValue;
284 m_totalMeshes = stats.StatsBlock[24].StatValue; 285 m_totalGeoPrims = stats.StatsBlock[24].StatValue;
285 m_inUseThreads = stats.StatsBlock[25].StatValue; 286 m_totalMeshes = stats.StatsBlock[25].StatValue;
287 m_inUseThreads = stats.StatsBlock[26].StatValue;
286 } 288 }
287 289
288 /// <summary> 290 /// <summary>
@@ -474,14 +476,13 @@ Asset service request failures: {3}" + Environment.NewLine,
474 args["Uptime"] = OSD.FromString (uptime); 476 args["Uptime"] = OSD.FromString (uptime);
475 args["Version"] = OSD.FromString (version); 477 args["Version"] = OSD.FromString (version);
476 478
479 args["FrameDilatn"] = OSD.FromString(String.Format("{0:0.##}", m_frameDilation));
477 args["Logging in Users"] = OSD.FromString(String.Format("{0:0.##}", 480 args["Logging in Users"] = OSD.FromString(String.Format("{0:0.##}",
478 m_usersLoggingIn)); 481 m_usersLoggingIn));
479 args["GeoPrims"] = OSD.FromString(String.Format("{0:0.##}", 482 args["GeoPrims"] = OSD.FromString(String.Format("{0:0.##}",
480 m_totalGeoPrims)); 483 m_totalGeoPrims));
481 args["Mesh Objects"] = OSD.FromString(String.Format("{0:0.##}", 484 args["Mesh Objects"] = OSD.FromString(String.Format("{0:0.##}",
482 m_totalMeshes)); 485 m_totalMeshes));
483 args["Polygon Count"] = OSD.FromString(String.Format("{0:0.##}", 0));
484 args["Texture Count"] = OSD.FromString(String.Format("{0:0.##}", 0));
485 args["XEngine Thread Count"] = OSD.FromString(String.Format("{0:0.##}", 486 args["XEngine Thread Count"] = OSD.FromString(String.Format("{0:0.##}",
486 m_inUseThreads)); 487 m_inUseThreads));
487 args["Util Thread Count"] = OSD.FromString(String.Format("{0:0.##}", 488 args["Util Thread Count"] = OSD.FromString(String.Format("{0:0.##}",
@@ -489,7 +490,7 @@ Asset service request failures: {3}" + Environment.NewLine,
489 args["System Thread Count"] = OSD.FromString(String.Format( 490 args["System Thread Count"] = OSD.FromString(String.Format(
490 "{0:0.##}", numberThreadsRunning)); 491 "{0:0.##}", numberThreadsRunning));
491 args["ProcMem"] = OSD.FromString(String.Format("{0:#,###,###.##}", 492 args["ProcMem"] = OSD.FromString(String.Format("{0:#,###,###.##}",
492 memUsage)); 493 memUsage));
493 494
494 return args; 495 return args;
495 } 496 }