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

change updates reprioritization control code. Do it under normal avatar updates timing and with a workjob not a timer issued thread.

LSLKeyTest
UbitUmarov 2015-12-17 12:20:02 +00:00
parent 3505ab759d
commit a4ed6111b0
1 changed files with 56 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,6 @@ namespace OpenSim.Region.Framework.Scenes
*/ */
} }
public bool ParcelAllowThisAvatarSounds public bool ParcelAllowThisAvatarSounds
{ {
get get
@ -281,7 +280,6 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_followCamAuto = false; private bool m_followCamAuto = false;
private Vector3? m_forceToApply; private Vector3? m_forceToApply;
private int m_userFlags; private int m_userFlags;
public int UserFlags public int UserFlags
@ -349,9 +347,8 @@ namespace OpenSim.Region.Framework.Scenes
private readonly Vector3[] Dir_Vectors = new Vector3[12]; private readonly Vector3[] Dir_Vectors = new Vector3[12];
protected Timer m_reprioritization_timer; protected int m_reprioritizationLastTime;
protected bool m_reprioritizing; protected bool m_reprioritizationBusy;
protected bool m_reprioritization_called;
private Quaternion m_headrotation = Quaternion.Identity; private Quaternion m_headrotation = Quaternion.Identity;
@ -371,7 +368,7 @@ namespace OpenSim.Region.Framework.Scenes
//private int m_moveToPositionStateStatus; //private int m_moveToPositionStateStatus;
//***************************************************** //*****************************************************
private bool m_collisionEventFlag = false; //private bool m_collisionEventFlag = false;
private object m_collisionEventLock = new Object(); private object m_collisionEventLock = new Object();
private int m_movementAnimationUpdateCounter = 0; private int m_movementAnimationUpdateCounter = 0;
@ -1033,11 +1030,9 @@ namespace OpenSim.Region.Framework.Scenes
AbsolutePosition = posLastMove = posLastSignificantMove = CameraPosition = AbsolutePosition = posLastMove = posLastSignificantMove = CameraPosition =
m_lastCameraPosition = ControllingClient.StartPos; m_lastCameraPosition = ControllingClient.StartPos;
childUpdatesBusy = true; // disable it for now // disable updates workjobs for now
childUpdatesBusy = true;
m_reprioritization_timer = new Timer(world.ReprioritizationInterval); m_reprioritizationBusy = true;
m_reprioritization_timer.Elapsed += new ElapsedEventHandler(Reprioritize);
m_reprioritization_timer.AutoReset = false;
AdjustKnownSeeds(); AdjustKnownSeeds();
@ -2047,6 +2042,10 @@ namespace OpenSim.Region.Framework.Scenes
if (m_teleportFlags > 0 && !isNPC || m_currentParcelHide) if (m_teleportFlags > 0 && !isNPC || m_currentParcelHide)
SendInitialDataToMe(); SendInitialDataToMe();
m_lastCameraPosition = CameraPosition;
m_reprioritizationLastTime = Util.EnvironmentTickCount() + 15000; // delay it
m_reprioritizationBusy = false;
m_log.DebugFormat("[CompleteMovement] SendInitialDataToMe: {0}ms", Util.EnvironmentTickCountSubtract(ts)); m_log.DebugFormat("[CompleteMovement] SendInitialDataToMe: {0}ms", Util.EnvironmentTickCountSubtract(ts));
if (!IsChildAgent && openChildAgents) if (!IsChildAgent && openChildAgents)
@ -2544,12 +2543,6 @@ namespace OpenSim.Region.Framework.Scenes
// Camera location in world. We'll need to raytrace // Camera location in world. We'll need to raytrace
// from this location from time to time. // from this location from time to time.
CameraPosition = agentData.CameraCenter; CameraPosition = agentData.CameraCenter;
if (Vector3.Distance(m_lastCameraPosition, CameraPosition) >= Scene.RootReprioritizationDistance)
{
ReprioritizeUpdates();
m_lastCameraPosition = CameraPosition;
}
// Use these three vectors to figure out what the agent is looking at // Use these three vectors to figure out what the agent is looking at
// Convert it to a Matrix and/or Quaternion // Convert it to a Matrix and/or Quaternion
CameraAtAxis = agentData.CameraAtAxis; CameraAtAxis = agentData.CameraAtAxis;
@ -3875,6 +3868,40 @@ namespace OpenSim.Region.Framework.Scenes
#region Significant Movement Method #region Significant Movement Method
private void checkRePrioritization()
{
if(IsDeleted || !ControllingClient.IsActive)
return;
if(m_reprioritizationBusy)
return;
int tdiff = Util.EnvironmentTickCountSubtract(m_reprioritizationLastTime);
if(tdiff < Scene.ReprioritizationInterval)
return;
Vector3 diff = CameraPosition - m_lastCameraPosition;
float limit;
if(IsChildAgent)
limit = (float)Scene.ChildReprioritizationDistance;
else
limit = (float)Scene.RootReprioritizationDistance;
limit *= limit;
if (diff.LengthSquared() < limit)
return;
m_reprioritizationBusy = true;
m_lastCameraPosition = CameraPosition;
Util.FireAndForget(
o =>
{
ControllingClient.ReprioritizeUpdates();
m_reprioritizationLastTime = Util.EnvironmentTickCount();
m_reprioritizationBusy = false;
}, null, "ScenePresence.Reprioritization");
}
/// <summary> /// <summary>
/// This checks for a significant movement and sends a coarselocationchange update /// This checks for a significant movement and sends a coarselocationchange update
/// </summary> /// </summary>
@ -3896,6 +3923,9 @@ namespace OpenSim.Region.Framework.Scenes
m_scene.EventManager.TriggerSignificantClientMovement(this); m_scene.EventManager.TriggerSignificantClientMovement(this);
} }
// updates priority recalc
checkRePrioritization();
if(childUpdatesBusy) if(childUpdatesBusy)
return; return;
@ -4222,12 +4252,6 @@ namespace OpenSim.Region.Framework.Scenes
if (cAgentData.Position != marker) // UGH!! if (cAgentData.Position != marker) // UGH!!
m_pos = cAgentData.Position + offset; m_pos = cAgentData.Position + offset;
if (Vector3.Distance(AbsolutePosition, posLastSignificantMove) >= Scene.ChildReprioritizationDistance)
{
posLastSignificantMove = AbsolutePosition;
ReprioritizeUpdates();
}
CameraPosition = cAgentData.Center + offset; CameraPosition = cAgentData.Center + offset;
if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0)
@ -4262,6 +4286,7 @@ namespace OpenSim.Region.Framework.Scenes
//cAgentData.AVHeight; //cAgentData.AVHeight;
//m_velocity = cAgentData.Velocity; //m_velocity = cAgentData.Velocity;
checkRePrioritization();
} }
public void CopyTo(AgentData cAgent) public void CopyTo(AgentData cAgent)
@ -4670,12 +4695,6 @@ namespace OpenSim.Region.Framework.Scenes
// Clear known regions // Clear known regions
KnownRegions = new Dictionary<ulong, string>(); KnownRegions = new Dictionary<ulong, string>();
lock (m_reprioritization_timer)
{
m_reprioritization_timer.Enabled = false;
m_reprioritization_timer.Elapsed -= new ElapsedEventHandler(Reprioritize);
}
// I don't get it but mono crashes when you try to dispose of this timer, // I don't get it but mono crashes when you try to dispose of this timer,
// unsetting the elapsed callback should be enough to allow for cleanup however. // unsetting the elapsed callback should be enough to allow for cleanup however.
// m_reprioritizationTimer.Dispose(); // m_reprioritizationTimer.Dispose();
@ -5450,31 +5469,6 @@ namespace OpenSim.Region.Framework.Scenes
return flags; return flags;
} }
private void ReprioritizeUpdates()
{
if (Scene.IsReprioritizationEnabled && Scene.UpdatePrioritizationScheme != UpdatePrioritizationSchemes.Time)
{
lock (m_reprioritization_timer)
{
if (!m_reprioritizing)
m_reprioritization_timer.Enabled = m_reprioritizing = true;
else
m_reprioritization_called = true;
}
}
}
private void Reprioritize(object sender, ElapsedEventArgs e)
{
ControllingClient.ReprioritizeUpdates();
lock (m_reprioritization_timer)
{
m_reprioritization_timer.Enabled = m_reprioritizing = m_reprioritization_called;
m_reprioritization_called = false;
}
}
// returns true it local teleport allowed and sets the destiny position into pos // returns true it local teleport allowed and sets the destiny position into pos
private bool CheckLocalTPLandingPoint(ref Vector3 pos) private bool CheckLocalTPLandingPoint(ref Vector3 pos)
@ -5946,10 +5940,11 @@ namespace OpenSim.Region.Framework.Scenes
SendLandCollisionEvent(att, scriptEvents.land_collision_end, m_scene.EventManager.TriggerScriptLandCollidingEnd); SendLandCollisionEvent(att, scriptEvents.land_collision_end, m_scene.EventManager.TriggerScriptLandCollidingEnd);
} }
} }
finally catch { }
{ // finally
m_collisionEventFlag = false; // {
} // m_collisionEventFlag = false;
// }
} }
private void TeleportFlagsDebug() { private void TeleportFlagsDebug() {