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

Implement "scene debug set root-upd-per" for dropping 1 in N root agent updates except to originator

Browse Source 
For experimental purposes.
Also corrects a previous bug where each terse update sent was counted rather than each set of terse updates to agents.
This commit is contained in:
Justin Clark-Casey (justincc)
2014-07-29 18:54:16 +01:00
parent 0f87a99e54
commit fcf5fb5dfd
3 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -247,6 +247,11 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
public float ClientVelocityUpdateTolerance { get; set; }
/// <summary>
/// If greater than 1, we only send terse updates to other root agents on every n updates.
/// </summary>
public int RootTerseUpdatePeriod { get; set; }
/// <summary>
/// If greater than 1, we only send terse updates to child agents on every n updates.
/// </summary>

21
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -3233,12 +3233,27 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="remoteClient"></param>
public void SendTerseUpdateToClient(IClientAPI remoteClient)
{
m_terseUpdateCount++;
// If the client is inactive, it's getting its updates from another
// server.
if (remoteClient.IsActive)
{
if (Scene.RootTerseUpdatePeriod > 1)
{
// Console.WriteLine(
// "{0} {1} {2} {3} {4} {5} for {6} to {7}",
// remoteClient.AgentId, UUID, remoteClient.SceneAgent.IsChildAgent, m_terseUpdateCount, Scene.RootTerseUpdatePeriod, Velocity.ApproxEquals(Vector3.Zero, 0.001f), Name, remoteClient.Name);
if (remoteClient.AgentId != UUID
&& !remoteClient.SceneAgent.IsChildAgent
&& m_terseUpdateCount % Scene.RootTerseUpdatePeriod != 0
&& !Velocity.ApproxEquals(Vector3.Zero, 0.001f))
{
// m_log.DebugFormat("[SCENE PRESENCE]: Discarded update from {0} to {1}, args {2} {3} {4} {5} {6} {7}",
// Name, remoteClient.Name, remoteClient.AgentId, UUID, remoteClient.SceneAgent.IsChildAgent, m_terseUpdateCount, Scene.RootTerseUpdatePeriod, Velocity.ApproxEquals(Vector3.Zero, 0.001f));
return;
}
}
if (Scene.ChildTerseUpdatePeriod > 1
&& remoteClient.SceneAgent.IsChildAgent
&& m_terseUpdateCount % Scene.ChildTerseUpdatePeriod != 0
@@ -3304,6 +3319,8 @@ namespace OpenSim.Region.Framework.Scenes
lastTerseUpdateToAllClientsTick = currentTick;
lastPositionSentToAllClients = OffsetPosition;
m_terseUpdateCount++;
// Console.WriteLine("Scheduled update for {0} in {1}", Name, Scene.Name);
m_scene.ForEachClient(SendTerseUpdateToClient);
}