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

reverted priorityQueue changes

avinationmerge
UbitUmarov 2012-03-21 23:15:32 +00:00
parent 68981d01f0
commit dc90c53596
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/PriorityQueue.cs
View File

@ -139,12 +139,7 @@ namespace OpenSim.Framework
{ {
// If there is anything in priority queue 0, return it first no // If there is anything in priority queue 0, return it first no
// matter what else. Breaks fairness. But very useful. // matter what else. Breaks fairness. But very useful.
// for (int iq = 0; iq < NumberOfImmediateQueues; iq++) for (int iq = 0; iq < NumberOfImmediateQueues; iq++)
// keep original order
for (int iq = 0; iq < NumberOfQueues; iq++)
{ {
if (m_heaps[iq].Count > 0) if (m_heaps[iq].Count > 0)
{ {
@ -156,7 +151,7 @@ namespace OpenSim.Framework
return true; return true;
} }
} }
/*
// To get the fair queing, we cycle through each of the // To get the fair queing, we cycle through each of the
// queues when finding an element to dequeue. // queues when finding an element to dequeue.
// We pull (NumberOfQueues - QueueIndex) items from each queue in order // We pull (NumberOfQueues - QueueIndex) items from each queue in order
@ -198,7 +193,7 @@ namespace OpenSim.Framework
return true; return true;
} }
} }
*/
timeinqueue = 0; timeinqueue = 0;
value = default(IEntityUpdate); value = default(IEntityUpdate);
return false; return false;