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

Merge branch 'diva-textures-osgrid' into texturetest

prioritization
Melanie 2009-10-02 04:19:22 +01:00
parent 18a744cac1 746dad7b74
commit 9a429610e2
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
View File

@ -82,7 +82,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
J2KImage imgrequest; J2KImage imgrequest;
// Do a linear search for this texture download // Do a linear search for this texture download
m_priorityQueue.Find(delegate(J2KImage img) { return img.m_requestedUUID == newRequest.RequestedAssetID; }, out imgrequest); lock (m_priorityQueue)
m_priorityQueue.Find(delegate(J2KImage img) { return img.m_requestedUUID == newRequest.RequestedAssetID; }, out imgrequest);
if (imgrequest != null) if (imgrequest != null)
{ {
@ -90,7 +91,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
//m_log.Debug("[TEX]: (CAN) ID=" + newRequest.RequestedAssetID); //m_log.Debug("[TEX]: (CAN) ID=" + newRequest.RequestedAssetID);
try { m_priorityQueue.Delete(imgrequest.m_priorityQueueHandle); } try
{
lock (m_priorityQueue)
m_priorityQueue.Delete(imgrequest.m_priorityQueueHandle);
}
catch (Exception) { } catch (Exception) { }
} }
else else
@ -113,8 +118,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//Update the requested priority //Update the requested priority
imgrequest.m_requestedPriority = newRequest.Priority; imgrequest.m_requestedPriority = newRequest.Priority;
try { m_priorityQueue.Replace(imgrequest.m_priorityQueueHandle, imgrequest); } try
catch (Exception) { imgrequest.m_priorityQueueHandle = null; m_priorityQueue.Add(ref imgrequest.m_priorityQueueHandle, imgrequest); } {
lock (m_priorityQueue)
m_priorityQueue.Replace(imgrequest.m_priorityQueueHandle, imgrequest);
}
catch (Exception)
{
imgrequest.m_priorityQueueHandle = null;
lock (m_priorityQueue)
m_priorityQueue.Add(ref imgrequest.m_priorityQueueHandle, imgrequest);
}
//Run an update //Run an update
imgrequest.RunUpdate(); imgrequest.RunUpdate();
@ -157,7 +171,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
imgrequest.m_requestedPriority = newRequest.Priority; imgrequest.m_requestedPriority = newRequest.Priority;
//Add this download to the priority queue //Add this download to the priority queue
m_priorityQueue.Add(ref imgrequest.m_priorityQueueHandle, imgrequest); lock (m_priorityQueue)
m_priorityQueue.Add(ref imgrequest.m_priorityQueueHandle, imgrequest);
//Run an update //Run an update
imgrequest.RunUpdate(); imgrequest.RunUpdate();
@ -217,7 +232,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
while (m_priorityQueue.Count > 0) while (m_priorityQueue.Count > 0)
{ {
J2KImage imagereq = m_priorityQueue.FindMax(); J2KImage imagereq = null;
lock (m_priorityQueue)
imagereq = m_priorityQueue.FindMax();
if (imagereq.m_decoded == true) if (imagereq.m_decoded == true)
{ {
@ -235,7 +252,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (imagereq.SendPackets(m_client, maxpack)) if (imagereq.SendPackets(m_client, maxpack))
{ {
// Send complete. Destroy any knowledge of this transfer // Send complete. Destroy any knowledge of this transfer
try { m_priorityQueue.Delete(imagereq.m_priorityQueueHandle); } try
{
lock (m_priorityQueue)
m_priorityQueue.Delete(imagereq.m_priorityQueueHandle);
}
catch (Exception) { } catch (Exception) { }
} }
} }