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

mess around with prioritizer

0.9.1.0-post-fixes
UbitUmarov 2019-01-25 20:49:18 +00:00
parent e3d0ec6f40
commit 3ee70aac0b
3 changed files with 98 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Framework/IClientAPI.cs
View File

@ -587,7 +587,6 @@ namespace OpenSim.Framework
{ {
private ISceneEntity m_entity; private ISceneEntity m_entity;
private PrimUpdateFlags m_flags; private PrimUpdateFlags m_flags;
private int m_updateTime;
public ISceneEntity Entity public ISceneEntity Entity
{ {
@ -599,9 +598,11 @@ namespace OpenSim.Framework
get { return m_flags; } get { return m_flags; }
} }
public int UpdateTime public virtual void Update()
{ {
get { return m_updateTime; } // we are on the new one
if (m_flags.HasFlag(PrimUpdateFlags.CancelKill))
m_flags = PrimUpdateFlags.FullUpdatewithAnim;
} }
public virtual void Update(EntityUpdate oldupdate) public virtual void Update(EntityUpdate oldupdate)
@ -612,28 +613,14 @@ namespace OpenSim.Framework
{ {
m_flags = PrimUpdateFlags.FullUpdatewithAnim; m_flags = PrimUpdateFlags.FullUpdatewithAnim;
} }
else if(updateFlags.HasFlag(PrimUpdateFlags.Kill)) else
return;
else // kill case will just merge in
m_flags |= updateFlags; m_flags |= updateFlags;
// Use the older of the updates as the updateTime
if (Util.EnvironmentTickCountCompare(UpdateTime, oldupdate.UpdateTime) > 0)
m_updateTime = oldupdate.UpdateTime;
} }
public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags) public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags)
{ {
m_entity = entity; m_entity = entity;
m_flags = flags; m_flags = flags;
m_updateTime = Util.EnvironmentTickCount();
}
public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, Int32 updateTime)
{
m_entity = entity;
m_flags = flags;
m_updateTime = updateTime;
} }
} }
@ -694,7 +681,7 @@ namespace OpenSim.Framework
FullUpdatewithAnim = FullUpdate | Animations, FullUpdatewithAnim = FullUpdate | Animations,
SendInTransit = 0x20000000, // 1 << 29 SendInTransit = 0x20000000, // 1 << 29
CancelKill = 0x41ffffff, // 1 << 30 CancelKill = 0x40000000, // 1 << 30
Kill = 0x80000000 // 1 << 31 Kill = 0x80000000 // 1 << 31
} }

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

@ -45,6 +45,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
using AssetLandmark = OpenSim.Framework.AssetLandmark; using AssetLandmark = OpenSim.Framework.AssetLandmark;
using Caps = OpenSim.Framework.Capabilities.Caps; using Caps = OpenSim.Framework.Capabilities.Caps;
using PermissionMask = OpenSim.Framework.PermissionMask; using PermissionMask = OpenSim.Framework.PermissionMask;
@ -4097,6 +4098,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (!IsActive) if (!IsActive)
return; return;
ScenePresence mysp = (ScenePresence)SceneAgent;
if (mysp == null)
return;
List<ObjectUpdatePacket.ObjectDataBlock> objectUpdateBlocks = null; List<ObjectUpdatePacket.ObjectDataBlock> objectUpdateBlocks = null;
List<ObjectUpdateCompressedPacket.ObjectDataBlock> compressedUpdateBlocks = null; List<ObjectUpdateCompressedPacket.ObjectDataBlock> compressedUpdateBlocks = null;
List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> terseUpdateBlocks = null; List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> terseUpdateBlocks = null;
@ -4114,39 +4119,36 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
EntityUpdate update; EntityUpdate update;
Int32 timeinqueue; // this is just debugging code & can be dropped later
bool doCulling = m_scene.ObjectsCullingByDistance; bool doCulling = m_scene.ObjectsCullingByDistance;
float cullingrange = 64.0f; float cullingrange = 64.0f;
HashSet<SceneObjectGroup> GroupsNeedFullUpdate = new HashSet<SceneObjectGroup>();
// Vector3 mycamera = Vector3.Zero;
Vector3 mypos = Vector3.Zero; Vector3 mypos = Vector3.Zero;
ScenePresence mysp = (ScenePresence)SceneAgent;
bool orderedDequeue = m_scene.UpdatePrioritizationScheme == UpdatePrioritizationSchemes.SimpleAngularDistance; bool orderedDequeue = m_scene.UpdatePrioritizationScheme == UpdatePrioritizationSchemes.SimpleAngularDistance;
// we should have a presence
if(mysp == null) HashSet<SceneObjectGroup> GroupsNeedFullUpdate = new HashSet<SceneObjectGroup>();
return;
if (doCulling) if (doCulling)
{ {
cullingrange = mysp.DrawDistance + m_scene.ReprioritizationDistance + 16f; cullingrange = mysp.DrawDistance + m_scene.ReprioritizationDistance + 16f;
// mycamera = mysp.CameraPosition;
mypos = mysp.AbsolutePosition; mypos = mysp.AbsolutePosition;
} }
while (maxUpdatesBytes > 0) while (maxUpdatesBytes > 0)
{ {
if (!IsActive)
return;
lock (m_entityUpdates.SyncRoot) lock (m_entityUpdates.SyncRoot)
{ {
if(orderedDequeue) if(orderedDequeue)
{ {
if (!m_entityUpdates.TryOrderedDequeue(out update, out timeinqueue)) if (!m_entityUpdates.TryOrderedDequeue(out update))
break; break;
} }
else else
{ {
if (!m_entityUpdates.TryDequeue(out update, out timeinqueue)) if (!m_entityUpdates.TryDequeue(out update))
break; break;
} }
} }
@ -4166,13 +4168,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
SceneObjectGroup grp = part.ParentGroup; SceneObjectGroup grp = part.ParentGroup;
if (grp.inTransit && !update.Flags.HasFlag(PrimUpdateFlags.SendInTransit)) if (grp.inTransit && !update.Flags.HasFlag(PrimUpdateFlags.SendInTransit))
continue; continue;
/* debug
if (update.Flags.HasFlag(PrimUpdateFlags.SendInTransit))
{
}
*/
if (grp.IsDeleted) if (grp.IsDeleted)
{ {
// Don't send updates for objects that have been marked deleted. // Don't send updates for objects that have been marked deleted.
@ -4234,20 +4230,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if(GroupsNeedFullUpdate.Contains(grp)) if(GroupsNeedFullUpdate.Contains(grp))
continue; continue;
bool inview = false; bool inViewGroups = false;
lock(GroupsInView) lock(GroupsInView)
inview = GroupsInView.Contains(grp); inViewGroups = GroupsInView.Contains(grp);
if(!inview) if(!inViewGroups)
{ {
float bradius = grp.GetBoundsRadius(); Vector3 partpos = grp.getCenterOffset();
Vector3 partpos = grp.AbsolutePosition + grp.getBoundsCenter();
// float dcam = (partpos - mycamera).LengthSquared();
float dpos = (partpos - mypos).LengthSquared(); float dpos = (partpos - mypos).LengthSquared();
// if(dcam < dpos) float maxview = grp.GetBoundsRadius() + cullingrange;
// dpos = dcam; if (dpos > maxview * maxview)
dpos = (float)Math.Sqrt(dpos) - bradius;
if(dpos > cullingrange)
continue; continue;
GroupsNeedFullUpdate.Add(grp); GroupsNeedFullUpdate.Add(grp);
@ -4488,10 +4480,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
foreach(SceneObjectGroup grp in GroupsNeedFullUpdate) foreach(SceneObjectGroup grp in GroupsNeedFullUpdate)
{ {
foreach(SceneObjectPart p in grp.Parts)
SendEntityUpdate(p,PrimUpdateFlags.CancelKill);
lock (GroupsInView) lock (GroupsInView)
GroupsInView.Add(grp); GroupsInView.Add(grp);
foreach (SceneObjectPart p in grp.Parts)
SendEntityUpdate(p, PrimUpdateFlags.CancelKill);
} }
} }
@ -4542,26 +4534,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if(!doCulling) if(!doCulling)
return; return;
if (!IsActive)
return;
if (CheckGroupsInViewBusy) if (CheckGroupsInViewBusy)
return; return;
ScenePresence mysp = (ScenePresence)SceneAgent;
if (mysp == null || mysp.IsDeleted)
return;
CheckGroupsInViewBusy = true; CheckGroupsInViewBusy = true;
float cullingrange = 64.0f; float cullingrange = mysp.DrawDistance + m_scene.ReprioritizationDistance + 16f;
// Vector3 mycamera = Vector3.Zero; Vector3 mypos = mysp.AbsolutePosition;
Vector3 mypos = Vector3.Zero;
ScenePresence mysp = (ScenePresence)SceneAgent;
if(mysp != null && !mysp.IsDeleted)
{
cullingrange = mysp.DrawDistance + m_scene.ReprioritizationDistance + 16f;
// mycamera = mysp.CameraPosition;
mypos = mysp.AbsolutePosition;
}
else
{
CheckGroupsInViewBusy= false;
return;
}
HashSet<SceneObjectGroup> NewGroupsInView = new HashSet<SceneObjectGroup>(); HashSet<SceneObjectGroup> NewGroupsInView = new HashSet<SceneObjectGroup>();
HashSet<SceneObjectGroup> GroupsNeedFullUpdate = new HashSet<SceneObjectGroup>(); HashSet<SceneObjectGroup> GroupsNeedFullUpdate = new HashSet<SceneObjectGroup>();
@ -4579,27 +4565,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if(grp.IsDeleted || grp.IsAttachment) if(grp.IsDeleted || grp.IsAttachment)
continue; continue;
float bradius = grp.GetBoundsRadius(); bool inviewgroups;
Vector3 grppos = grp.AbsolutePosition + grp.getBoundsCenter();
// float dcam = (grppos - mycamera).LengthSquared();
float dpos = (grppos - mypos).LengthSquared();
// if(dcam < dpos)
// dpos = dcam;
dpos = (float)Math.Sqrt(dpos) - bradius;
bool inview;
lock (GroupsInView) lock (GroupsInView)
inview = GroupsInView.Contains(grp); inviewgroups = GroupsInView.Contains(grp);
if(dpos > cullingrange) Vector3 grppos = grp.getCenterOffset();
float dpos = (grppos - mypos).LengthSquared();
float maxview = grp.GetBoundsRadius() + cullingrange;
if (dpos > maxview * maxview)
{ {
if(inview) if(inviewgroups)
kills.Add(grp); kills.Add(grp);
} }
else else
{ {
if(!inview) if(!inviewgroups)
GroupsNeedFullUpdate.Add(grp); GroupsNeedFullUpdate.Add(grp);
NewGroupsInView.Add(grp); NewGroupsInView.Add(grp);
} }
@ -4645,15 +4626,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private bool UpdatePriorityHandler(ref uint priority, ISceneEntity entity) private bool UpdatePriorityHandler(ref uint priority, ISceneEntity entity)
{ {
if (entity != null) if (entity == null)
{ return false;
priority = m_prioritizer.GetUpdatePriority(this, entity); priority = m_prioritizer.GetUpdatePriority(this, entity);
return true; return true;
} }
return false;
}
public void FlushPrimUpdates() public void FlushPrimUpdates()
{ {
m_log.WarnFormat("[CLIENT]: Flushing prim updates to " + m_firstName + " " + m_lastName); m_log.WarnFormat("[CLIENT]: Flushing prim updates to " + m_firstName + " " + m_lastName);
@ -4885,7 +4864,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
bool orderedDequeue = m_scene.UpdatePrioritizationScheme == UpdatePrioritizationSchemes.SimpleAngularDistance; bool orderedDequeue = m_scene.UpdatePrioritizationScheme == UpdatePrioritizationSchemes.SimpleAngularDistance;
EntityUpdate iupdate; EntityUpdate iupdate;
Int32 timeinqueue; // this is just debugging code & can be dropped later
while (maxUpdateBytes > 0) while (maxUpdateBytes > 0)
{ {
@ -4893,12 +4871,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
if(orderedDequeue) if(orderedDequeue)
{ {
if (!m_entityProps.TryOrderedDequeue(out iupdate, out timeinqueue)) if (!m_entityProps.TryOrderedDequeue(out iupdate))
break; break;
} }
else else
{ {
if (!m_entityProps.TryDequeue(out iupdate, out timeinqueue)) if (!m_entityProps.TryDequeue(out iupdate))
break; break;
} }
} }

46
OpenSim/Region/Framework/Scenes/Prioritizer.cs
View File

@ -165,15 +165,6 @@ namespace OpenSim.Region.Framework.Scenes
// And convert the distance to a priority queue, this computation gives queues // And convert the distance to a priority queue, this computation gives queues
// at 10, 20, 40, 80, 160, 320, 640, and 1280m // at 10, 20, 40, 80, 160, 320, 640, and 1280m
uint pqueue = PriorityQueue.NumberOfImmediateQueues + 1; // reserve attachments queue uint pqueue = PriorityQueue.NumberOfImmediateQueues + 1; // reserve attachments queue
uint queues = PriorityQueue.NumberOfQueues - PriorityQueue.NumberOfImmediateQueues;
/*
for (int i = 0; i < queues - 1; i++)
{
if (distance < 30 * Math.Pow(2.0,i))
break;
pqueue++;
}
*/
if (distance > 10f) if (distance > 10f)
{ {
float tmp = (float)Math.Log((double)distance) * 1.442695f - 3.321928f; float tmp = (float)Math.Log((double)distance) * 1.442695f - 3.321928f;
@ -182,8 +173,6 @@ namespace OpenSim.Region.Framework.Scenes
// 1st constant is 1/(log(2)) (natural log) so we get log2(distance) // 1st constant is 1/(log(2)) (natural log) so we get log2(distance)
// 2st constant makes it be log2(distance/10) // 2st constant makes it be log2(distance/10)
pqueue += (uint)tmp; pqueue += (uint)tmp;
if (pqueue > queues - 1)
pqueue = queues - 1;
} }
// If this is a root agent, then determine front & back // If this is a root agent, then determine front & back
@ -216,11 +205,6 @@ namespace OpenSim.Region.Framework.Scenes
private uint ComputeAngleDistancePriority(ScenePresence presence, ISceneEntity entity) private uint ComputeAngleDistancePriority(ScenePresence presence, ISceneEntity entity)
{ {
// And convert the distance to a priority queue, this computation gives queues
// at 10, 20, 40, 80, 160, 320, 640, and 1280m
// uint minpqueue = PriorityQueue.NumberOfImmediateQueues;
uint maxqueue = PriorityQueue.NumberOfQueues - PriorityQueue.NumberOfImmediateQueues -1;
// uint pqueue = minpqueue;
uint pqueue = PriorityQueue.NumberOfImmediateQueues; uint pqueue = PriorityQueue.NumberOfImmediateQueues;
float distance; float distance;
@ -228,25 +212,39 @@ namespace OpenSim.Region.Framework.Scenes
if(entity is ScenePresence) if(entity is ScenePresence)
{ {
ScenePresence sp = entity as ScenePresence; ScenePresence sp = entity as ScenePresence;
distance = Vector3.Distance(presencePos, sp.AbsolutePosition); distance = Vector3.DistanceSquared(presencePos, sp.AbsolutePosition);
distance *= 0.5f; if (distance > 400f)
}
else
{ {
SceneObjectGroup group = (entity as SceneObjectPart).ParentGroup; float tmp = (float)Math.Log(distance) * 0.7213475f - 4.321928f;
pqueue += (uint)tmp;
}
return pqueue;
}
SceneObjectPart sop = entity as SceneObjectPart;
SceneObjectGroup group = sop.ParentGroup;
if(presence.ParentPart != null) if(presence.ParentPart != null)
{ {
if(presence.ParentPart.ParentGroup == group) if(presence.ParentPart.ParentGroup == group)
return pqueue; return pqueue;
} }
if (group.IsAttachment) if (group.IsAttachment)
{ {
if(group.RootPart.LocalId == presence.LocalId) if(group.RootPart.LocalId == presence.LocalId)
return pqueue; return pqueue;
distance = Vector3.DistanceSquared(presencePos, group.AbsolutePosition);
if (distance > 400f)
{
float tmp = (float)Math.Log(distance) * 0.7213475f - 4.321928f;
pqueue += (uint)tmp;
}
return pqueue;
} }
float bradius = group.GetBoundsRadius(); float bradius = group.GetBoundsRadius();
Vector3 grppos = group.AbsolutePosition + group.getBoundsCenter(); Vector3 grppos = group.getCenterOffset();
distance = Vector3.Distance(presencePos, grppos); distance = Vector3.Distance(presencePos, grppos);
distance -= bradius; distance -= bradius;
distance *= group.getAreaFactor(); distance *= group.getAreaFactor();
@ -256,7 +254,6 @@ namespace OpenSim.Region.Framework.Scenes
distance *= 0.6f; distance *= 0.6f;
else if(group.GetSittingAvatarsCount() > 0) else if(group.GetSittingAvatarsCount() > 0)
distance *= 0.5f; distance *= 0.5f;
}
if (distance > 10f) if (distance > 10f)
{ {
@ -265,10 +262,7 @@ namespace OpenSim.Region.Framework.Scenes
// now // now
// 1st constant is 1/(log(2)) (natural log) so we get log2(distance) // 1st constant is 1/(log(2)) (natural log) so we get log2(distance)
// 2st constant makes it be log2(distance/10) // 2st constant makes it be log2(distance/10)
pqueue += (uint)tmp; pqueue += (uint)tmp;
if (pqueue > maxqueue)
pqueue = maxqueue;
} }
return pqueue; return pqueue;