aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Statistics
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-06 19:52:54 +0000
committerJustin Clarke Casey2008-10-06 19:52:54 +0000
commitcb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a (patch)
treef4f8c4f3b849f35e4a4e56d05740ad19651d4a71 /OpenSim/Framework/Statistics
parentcleaning up OSHttpRequest removing old Http stuff. also adding test (diff)
downloadopensim-SC_OLD-cb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a.zip
opensim-SC_OLD-cb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a.tar.gz
opensim-SC_OLD-cb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a.tar.bz2
opensim-SC_OLD-cb7a9eaa09fba301ba6b6838cb9e3cedfc29a32a.tar.xz
* Stop the sim stats reporter reusing the same SimStatsPacket for all clients
* I believe this was the cause of the remaining packet_out_of_order messages in the Linden client logs * There were race conditions where multiple clientstacks would overwrite each other's sequence numbers
Diffstat (limited to 'OpenSim/Framework/Statistics')
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsCollector.cs48
1 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 2f6bb7e..48bed81 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -216,31 +216,31 @@ namespace OpenSim.Framework.Statistics
216 /// client purposes) sends information to listeners. 216 /// client purposes) sends information to listeners.
217 /// </summary> 217 /// </summary>
218 /// <param name="pack"></param> 218 /// <param name="pack"></param>
219 public void ReceiveClassicSimStatsPacket(SimStatsPacket statsPacket) 219 public void ReceiveClassicSimStatsPacket(SimStats stats)
220 { 220 {
221 // FIXME: Really shouldn't rely on the probably arbitrary order in which 221 // FIXME: SimStats shouldn't allow an arbitrary stat packing order (which is inherited from the original
222 // stats are packed into the packet 222 // SimStatsPacket that was being used).
223 timeDilation = statsPacket.Stat[0].StatValue; 223 timeDilation = stats.StatsBlock[0].StatValue;
224 simFps = statsPacket.Stat[1].StatValue; 224 simFps = stats.StatsBlock[1].StatValue;
225 physicsFps = statsPacket.Stat[2].StatValue; 225 physicsFps = stats.StatsBlock[2].StatValue;
226 agentUpdates = statsPacket.Stat[3].StatValue; 226 agentUpdates = stats.StatsBlock[3].StatValue;
227 rootAgents = statsPacket.Stat[4].StatValue; 227 rootAgents = stats.StatsBlock[4].StatValue;
228 childAgents = statsPacket.Stat[5].StatValue; 228 childAgents = stats.StatsBlock[5].StatValue;
229 totalPrims = statsPacket.Stat[6].StatValue; 229 totalPrims = stats.StatsBlock[6].StatValue;
230 activePrims = statsPacket.Stat[7].StatValue; 230 activePrims = stats.StatsBlock[7].StatValue;
231 totalFrameTime = statsPacket.Stat[8].StatValue; 231 totalFrameTime = stats.StatsBlock[8].StatValue;
232 netFrameTime = statsPacket.Stat[9].StatValue; 232 netFrameTime = stats.StatsBlock[9].StatValue;
233 physicsFrameTime = statsPacket.Stat[10].StatValue; 233 physicsFrameTime = stats.StatsBlock[10].StatValue;
234 otherFrameTime = statsPacket.Stat[11].StatValue; 234 otherFrameTime = stats.StatsBlock[11].StatValue;
235 imageFrameTime = statsPacket.Stat[12].StatValue; 235 imageFrameTime = stats.StatsBlock[12].StatValue;
236 inPacketsPerSecond = statsPacket.Stat[13].StatValue; 236 inPacketsPerSecond = stats.StatsBlock[13].StatValue;
237 outPacketsPerSecond = statsPacket.Stat[14].StatValue; 237 outPacketsPerSecond = stats.StatsBlock[14].StatValue;
238 unackedBytes = statsPacket.Stat[15].StatValue; 238 unackedBytes = stats.StatsBlock[15].StatValue;
239 agentFrameTime = statsPacket.Stat[16].StatValue; 239 agentFrameTime = stats.StatsBlock[16].StatValue;
240 pendingDownloads = statsPacket.Stat[17].StatValue; 240 pendingDownloads = stats.StatsBlock[17].StatValue;
241 pendingUploads = statsPacket.Stat[18].StatValue; 241 pendingUploads = stats.StatsBlock[18].StatValue;
242 activeScripts = statsPacket.Stat[19].StatValue; 242 activeScripts = stats.StatsBlock[19].StatValue;
243 scriptLinesPerSecond = statsPacket.Stat[20].StatValue; 243 scriptLinesPerSecond = stats.StatsBlock[20].StatValue;
244 } 244 }
245 245
246 /// <summary> 246 /// <summary>