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

Fixed the stats in show client stats. Also left some comments with observations about AgentUpdates.

cpu-performance
Diva Canto 2013-07-19 22:11:32 -07:00
parent 0d5b2dd5ce
commit f0126a1575
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5567,7 +5567,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#region Packet Handlers #region Packet Handlers
public int TotalSignificantAgentUpdates { get; private set; } public int TotalAgentUpdates { get; set; }
#region Scene/Avatar #region Scene/Avatar
@ -5583,11 +5583,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// least likely to change. I've made an initial // least likely to change. I've made an initial
// guess at that. // guess at that.
if ( if (
(x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) || /* These 4 are the worst offenders! We should consider ignoring most of them.
* With Singularity, there is a bug where sometimes the spam on these doesn't stop */
(x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) || (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
(x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) || (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
(x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) || (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
(x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) || (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
/* */
(x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
(x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) || (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
(x.Far != m_lastAgentUpdateArgs.Far) || (x.Far != m_lastAgentUpdateArgs.Far) ||
(x.Flags != m_lastAgentUpdateArgs.Flags) || (x.Flags != m_lastAgentUpdateArgs.Flags) ||
@ -5597,8 +5600,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
(x.AgentID != m_lastAgentUpdateArgs.AgentID) (x.AgentID != m_lastAgentUpdateArgs.AgentID)
) )
{ {
// m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name); //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
TotalSignificantAgentUpdates++; // x.CameraAtAxis, x.CameraCenter);
//m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
// x.CameraLeftAxis, x.CameraUpAxis);
//m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
// x.BodyRotation, x.HeadRotation);
//m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3}",
// x.ControlFlags, x.Flags, x.Far, x.State);
m_lastAgentUpdateArgs.AgentID = x.AgentID; m_lastAgentUpdateArgs.AgentID = x.AgentID;
m_lastAgentUpdateArgs.BodyRotation = x.BodyRotation; m_lastAgentUpdateArgs.BodyRotation = x.BodyRotation;
@ -5662,7 +5671,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// if (update) // if (update)
// { // {
//// m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name); //// m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
TotalSignificantAgentUpdates++;
m_thisAgentUpdateArgs.AgentID = x.AgentID; m_thisAgentUpdateArgs.AgentID = x.AgentID;
m_thisAgentUpdateArgs.BodyRotation = x.BodyRotation; m_thisAgentUpdateArgs.BodyRotation = x.BodyRotation;

2
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -1312,6 +1312,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_discardAgentUpdates) if (m_discardAgentUpdates)
return; return;
((LLClientView)client).TotalAgentUpdates++;
AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet; AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
if (agentUpdate.AgentData.SessionID != client.SessionId if (agentUpdate.AgentData.SessionID != client.SessionId

8
OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
View File

@ -611,7 +611,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
// //
if (showParams.Length <= 4) if (showParams.Length <= 4)
{ {
m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", "Region", "Name", "Root", "Time", "Reqs/min", "Sig. AgentUpdates"); m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", "Region", "Name", "Root", "Time", "Reqs/min", "AgentUpdates");
foreach (Scene scene in m_scenes.Values) foreach (Scene scene in m_scenes.Values)
{ {
scene.ForEachClient( scene.ForEachClient(
@ -630,9 +630,9 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
(DateTime.Now - cinfo.StartedTime).Minutes, (DateTime.Now - cinfo.StartedTime).Minutes,
avg_reqs, avg_reqs,
string.Format( string.Format(
"{0}, {1}%", "{0} ({1:0.00}%)",
llClient.TotalSignificantAgentUpdates, llClient.TotalAgentUpdates,
(float)llClient.TotalSignificantAgentUpdates / cinfo.SyncRequests["AgentUpdate"] * 100)); (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100));
} }
}); });
} }