diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index d86b1237bc..1448722fce 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -38,44 +38,37 @@ using System.Reflection;
namespace OpenSim.Region.ClientStack.LindenUDP
{
///
- /// We use this class to store image data and associated request data and attributes
+ /// Stores information about a current texture download and a reference to the texture asset
///
public class J2KImage
{
+ private const int IMAGE_PACKET_SIZE = 1000;
+ private const int FIRST_PACKET_SIZE = 600;
+
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- public double m_designatedPriorityKey;
- public double m_requestedPriority = 0.0d;
- public uint m_lastSequence = 0;
+ public uint m_lastSequence;
+ public float m_requestedPriority;
public uint m_requestedPacketNumber;
public sbyte m_requestedDiscardLevel;
public UUID m_requestedUUID;
public IJ2KDecoder m_j2kDecodeModule;
public IAssetService m_assetCache;
- public OpenJPEG.J2KLayerInfo[] Layers = new OpenJPEG.J2KLayerInfo[0];
- public AssetBase m_MissingSubstitute = null;
- public bool m_decoded = false;
- public bool m_completedSendAtCurrentDiscardLevel;
+ public OpenJPEG.J2KLayerInfo[] m_layers;
+ public bool m_decoded;
+ public bool m_hasasset;
+ public C5.IPriorityQueueHandle m_priorityQueueHandle;
- private sbyte m_discardLevel=-1;
private uint m_packetNumber;
- private bool m_decoderequested = false;
- public bool m_hasasset = false;
- private bool m_asset_requested = false;
- private bool m_sentinfo = false;
- private uint m_stopPacket = 0;
- private const int cImagePacketSize = 1000;
- private const int cFirstPacketSize = 600;
+ private bool m_decoderequested;
+ private bool m_asset_requested;
+ private bool m_sentinfo;
+ private uint m_stopPacket;
+ private AssetBase m_asset;
+ private int m_assetDataLength;
+ private LLImageManager m_imageManager;
- private AssetBase m_asset = null;
- private int m_assetDataLength = 0;
-
- private LLImageManager m_image;
-
- public J2KImage(LLImageManager image)
- {
- m_image = image;
- }
+ #region Properties
public uint m_pPacketNumber
{
@@ -88,10 +81,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public byte[] Data
{
- get
- {
- if (m_asset != null)
- return m_asset.Data;
+ get
+ {
+ if (m_asset != null)
+ return m_asset.Data;
else
return null;
}
@@ -101,9 +94,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
if (!m_decoded)
return 0;
+
try
{
- return (ushort)(((m_assetDataLength - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1);
+ return (ushort)(((m_assetDataLength - FIRST_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE) + 1);
}
catch (Exception)
{
@@ -114,204 +108,45 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
}
- public void DropAsset()
+ #endregion Properties
+
+ public J2KImage(LLImageManager imageManager)
{
- //m_log.WarnFormat("[LLIMAGE MANAGER]: Dropping texture asset {0}", m_requestedUUID);
- m_asset = null;
- m_hasasset = false;
- m_asset_requested = false;
+ m_imageManager = imageManager;
}
- public void J2KDecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers)
- {
- m_image.m_outstandingtextures++;
- Layers = layers;
- m_decoded = true;
- RunUpdate();
- }
-
- public void AssetDataCallback(UUID AssetID, AssetBase asset)
- {
- m_hasasset = true;
- if (asset == null || asset.Data == null)
- {
- m_asset = m_MissingSubstitute;
- }
- else
- {
- m_asset = asset;
- }
-
- m_assetDataLength = m_asset.Data.Length;
-
- RunUpdate();
- }
-
- protected void AssetReceived(string id, Object sender, AssetBase asset)
- {
- UUID assetID = UUID.Zero;
- if (asset != null)
- assetID = asset.FullID;
-
- AssetDataCallback(assetID, asset);
-
- }
-
- private int GetPacketForBytePosition(int bytePosition)
- {
- return ((bytePosition - cFirstPacketSize + cImagePacketSize - 1) / cImagePacketSize) + 1;
- }
-
- public int LastPacketSize()
- {
- if (m_packetNumber == 1)
- return m_assetDataLength;
- int lastsize = (m_assetDataLength - cFirstPacketSize) % cImagePacketSize;
- //If the last packet size is zero, it's really cImagePacketSize, it sits on the boundary
- if (lastsize == 0)
- {
- lastsize = cImagePacketSize;
- }
- return lastsize;
- }
-
- public int CurrentBytePosition()
- {
- if (m_packetNumber == 0)
- return 0;
- if (m_packetNumber == 1)
- return cFirstPacketSize;
-
- int result = cFirstPacketSize + ((int)m_packetNumber - 2) * cImagePacketSize;
- if (result < 0)
- {
- result = cFirstPacketSize;
- }
- return result;
- }
-
- public bool SendFirstPacket(LLClientView client)
- {
- // this means we don't have
- if (Data == null)
- {
- client.SendImageNotFound(m_requestedUUID);
- m_log.WarnFormat("[TEXTURE]: Got null Data element on a asset {0}.. and the missing image Data property is al", m_requestedUUID);
- return true;
- }
- // Do we have less then 1 packet's worth of data?
- else if (m_assetDataLength <= cFirstPacketSize)
- {
- // Send only 1 packet
- client.SendImageFirstPart(1, m_requestedUUID, (uint)m_assetDataLength, m_asset.Data, 2);
- m_stopPacket = 0;
- return true;
- }
- else
- {
- byte[] firstImageData = new byte[cFirstPacketSize];
- try
- {
- Buffer.BlockCopy(m_asset.Data, 0, firstImageData, 0, (int)cFirstPacketSize);
- client.SendImageFirstPart(TexturePacketCount(), m_requestedUUID, (uint)m_assetDataLength, firstImageData, 2);
- }
- catch (Exception)
- {
- m_log.Error("Texture block copy failed. Possibly out of memory?");
- return true;
- }
- }
- return false;
- }
-
- private bool SendPacket(LLClientView client)
- {
- bool complete = false;
- int imagePacketSize = ((int)m_packetNumber == (TexturePacketCount())) ? LastPacketSize() : cImagePacketSize;
-
- try
- {
- if ((CurrentBytePosition() + cImagePacketSize) > m_assetDataLength)
- {
- imagePacketSize = LastPacketSize();
- complete=true;
- if ((CurrentBytePosition() + imagePacketSize) > m_assetDataLength)
- {
- imagePacketSize = m_assetDataLength - CurrentBytePosition();
- complete = true;
- }
- }
-
- // It's concievable that the client might request packet one
- // from a one packet image, which is really packet 0,
- // which would leave us with a negative imagePacketSize..
- if (imagePacketSize > 0)
- {
- byte[] imageData = new byte[imagePacketSize];
- try
- {
- Buffer.BlockCopy(m_asset.Data, CurrentBytePosition(), imageData, 0, imagePacketSize);
- }
- catch (Exception e)
- {
- m_log.Error("Error copying texture block. Out of memory? imagePacketSize was " + imagePacketSize.ToString() + " on packet " + m_packetNumber.ToString() + " out of " + m_stopPacket.ToString() + ". Exception: " + e.ToString());
- return false;
- }
-
- //Send the packet
- client.SendImageNextPart((ushort)(m_packetNumber-1), m_requestedUUID, imageData);
- }
- if (complete)
- {
- return false;
- }
- else
- {
- return true;
- }
- }
- catch (Exception)
- {
- return false;
- }
- }
public bool SendPackets(LLClientView client, int maxpack)
{
-
- if (!m_completedSendAtCurrentDiscardLevel)
+ if (m_packetNumber <= m_stopPacket)
{
- if (m_packetNumber <= m_stopPacket)
+ bool SendMore = true;
+ if (!m_sentinfo || (m_packetNumber == 0))
{
- bool SendMore = true;
- if (!m_sentinfo || (m_packetNumber == 0))
+ if (SendFirstPacket(client))
{
- if (SendFirstPacket(client))
- {
- SendMore = false;
- }
- m_sentinfo = true;
- m_packetNumber++;
- }
- // bool ignoreStop = false;
- if (m_packetNumber < 2)
- {
- m_packetNumber = 2;
- }
-
- int count = 0;
- while (SendMore && count < maxpack && m_packetNumber <= m_stopPacket)
- {
- count++;
- SendMore = SendPacket(client);
- m_packetNumber++;
- }
-
- if (m_packetNumber > m_stopPacket)
- {
- return true;
+ SendMore = false;
}
+ m_sentinfo = true;
+ m_packetNumber++;
}
+ // bool ignoreStop = false;
+ if (m_packetNumber < 2)
+ {
+ m_packetNumber = 2;
+ }
+
+ int count = 0;
+ while (SendMore && count < maxpack && m_packetNumber <= m_stopPacket)
+ {
+ count++;
+ SendMore = SendPacket(client);
+ m_packetNumber++;
+ }
+
+ if (m_packetNumber > m_stopPacket)
+ return true;
}
+
return false;
}
@@ -323,19 +158,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (!m_hasasset)
{
-
if (!m_asset_requested)
{
m_asset_requested = true;
m_assetCache.Get(m_requestedUUID.ToString(), this, AssetReceived);
-
}
-
}
else
{
-
-
if (!m_decoded)
{
//We need to decode the requested image first
@@ -362,59 +192,202 @@ namespace OpenSim.Region.ClientStack.LindenUDP
J2KDecodedCallback(m_requestedUUID, new OpenJPEG.J2KLayerInfo[0]);
}
}
-
}
else
{
- //discardLevel of -1 means just update the priority
- if (m_requestedDiscardLevel != -1)
+ // Check for missing image asset data
+ if (m_asset == null || m_asset.Data == null)
{
- //Evaluate the discard level
- //First, is it positive?
- if (m_requestedDiscardLevel >= 0)
- {
- if (m_requestedDiscardLevel > Layers.Length - 1)
- {
- m_discardLevel = (sbyte)(Layers.Length - 1);
- }
- else
- {
- m_discardLevel = m_requestedDiscardLevel;
- }
+ // FIXME:
+ m_packetNumber = m_stopPacket;
+ return;
+ }
- //Calculate the m_stopPacket
- if (Layers.Length > 0)
- {
- m_stopPacket = (uint)GetPacketForBytePosition(Layers[(Layers.Length - 1) - m_discardLevel].End);
- //I don't know why, but the viewer seems to expect the final packet if the file
- //is just one packet bigger.
- if (TexturePacketCount() == m_stopPacket + 1)
- {
- m_stopPacket = TexturePacketCount();
- }
- }
- else
+ if (m_requestedDiscardLevel >= 0 || m_stopPacket == 0)
+ {
+ int maxDiscardLevel = Math.Max(0, m_layers.Length - 1);
+
+ // Treat initial texture downloads with a DiscardLevel of -1 a request for the highest DiscardLevel
+ if (m_requestedDiscardLevel < 0 && m_stopPacket == 0)
+ m_requestedDiscardLevel = (sbyte)maxDiscardLevel;
+
+ // Clamp at the highest discard level
+ m_requestedDiscardLevel = (sbyte)Math.Min(m_requestedDiscardLevel, maxDiscardLevel);
+
+ //Calculate the m_stopPacket
+ if (m_layers.Length > 0)
+ {
+ m_stopPacket = (uint)GetPacketForBytePosition(m_layers[(m_layers.Length - 1) - m_requestedDiscardLevel].End);
+ //I don't know why, but the viewer seems to expect the final packet if the file
+ //is just one packet bigger.
+ if (TexturePacketCount() == m_stopPacket + 1)
{
m_stopPacket = TexturePacketCount();
}
- //Don't reset packet number unless we're waiting or it's ahead of us
- if (m_completedSendAtCurrentDiscardLevel || m_requestedPacketNumber>m_packetNumber)
- {
- m_packetNumber = m_requestedPacketNumber;
- }
-
- if (m_packetNumber <= m_stopPacket)
- {
- m_completedSendAtCurrentDiscardLevel = false;
- }
}
- }
- else
- {
- m_packetNumber = m_stopPacket;
+ else
+ {
+ m_stopPacket = TexturePacketCount();
+ }
+
+ m_packetNumber = m_requestedPacketNumber;
}
}
}
}
+
+ private bool SendPacket(LLClientView client)
+ {
+ bool complete = false;
+ int imagePacketSize = ((int)m_packetNumber == (TexturePacketCount())) ? LastPacketSize() : IMAGE_PACKET_SIZE;
+
+ try
+ {
+ if ((CurrentBytePosition() + IMAGE_PACKET_SIZE) > m_assetDataLength)
+ {
+ imagePacketSize = LastPacketSize();
+ complete = true;
+ if ((CurrentBytePosition() + imagePacketSize) > m_assetDataLength)
+ {
+ imagePacketSize = m_assetDataLength - CurrentBytePosition();
+ complete = true;
+ }
+ }
+
+ // It's concievable that the client might request packet one
+ // from a one packet image, which is really packet 0,
+ // which would leave us with a negative imagePacketSize..
+ if (imagePacketSize > 0)
+ {
+ byte[] imageData = new byte[imagePacketSize];
+ try
+ {
+ Buffer.BlockCopy(m_asset.Data, CurrentBytePosition(), imageData, 0, imagePacketSize);
+ }
+ catch (Exception e)
+ {
+ m_log.Error("Error copying texture block. Out of memory? imagePacketSize was " + imagePacketSize.ToString() + " on packet " + m_packetNumber.ToString() + " out of " + m_stopPacket.ToString() + ". Exception: " + e.ToString());
+ return false;
+ }
+
+ //Send the packet
+ client.SendImageNextPart((ushort)(m_packetNumber - 1), m_requestedUUID, imageData);
+ }
+ if (complete)
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+ catch (Exception)
+ {
+ return false;
+ }
+ }
+
+ private int GetPacketForBytePosition(int bytePosition)
+ {
+ return ((bytePosition - FIRST_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE) + 1;
+ }
+
+ private int LastPacketSize()
+ {
+ if (m_packetNumber == 1)
+ return m_assetDataLength;
+ int lastsize = (m_assetDataLength - FIRST_PACKET_SIZE) % IMAGE_PACKET_SIZE;
+ //If the last packet size is zero, it's really cImagePacketSize, it sits on the boundary
+ if (lastsize == 0)
+ {
+ lastsize = IMAGE_PACKET_SIZE;
+ }
+ return lastsize;
+ }
+
+ private int CurrentBytePosition()
+ {
+ if (m_packetNumber == 0)
+ return 0;
+ if (m_packetNumber == 1)
+ return FIRST_PACKET_SIZE;
+
+ int result = FIRST_PACKET_SIZE + ((int)m_packetNumber - 2) * IMAGE_PACKET_SIZE;
+ if (result < 0)
+ {
+ result = FIRST_PACKET_SIZE;
+ }
+ return result;
+ }
+
+ private bool SendFirstPacket(LLClientView client)
+ {
+ // this means we don't have
+ if (Data == null)
+ {
+ client.SendImageNotFound(m_requestedUUID);
+ m_log.WarnFormat("[TEXTURE]: Got null Data element on a asset {0}.. and the missing image Data property is al", m_requestedUUID);
+ return true;
+ }
+ // Do we have less then 1 packet's worth of data?
+ else if (m_assetDataLength <= FIRST_PACKET_SIZE)
+ {
+ // Send only 1 packet
+ client.SendImageFirstPart(1, m_requestedUUID, (uint)m_assetDataLength, m_asset.Data, 2);
+ m_stopPacket = 0;
+ return true;
+ }
+ else
+ {
+ byte[] firstImageData = new byte[FIRST_PACKET_SIZE];
+ try
+ {
+ Buffer.BlockCopy(m_asset.Data, 0, firstImageData, 0, (int)FIRST_PACKET_SIZE);
+ client.SendImageFirstPart(TexturePacketCount(), m_requestedUUID, (uint)m_assetDataLength, firstImageData, 2);
+ }
+ catch (Exception)
+ {
+ m_log.Error("Texture block copy failed. Possibly out of memory?");
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void J2KDecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers)
+ {
+ m_layers = layers;
+ m_decoded = true;
+ RunUpdate();
+ }
+
+ private void AssetDataCallback(UUID AssetID, AssetBase asset)
+ {
+ m_hasasset = true;
+
+ if (asset == null || asset.Data == null)
+ {
+ m_asset = null;
+ m_decoded = true;
+ }
+ else
+ {
+ m_asset = asset;
+ m_assetDataLength = m_asset.Data.Length;
+ }
+
+ RunUpdate();
+ }
+
+ private void AssetReceived(string id, Object sender, AssetBase asset)
+ {
+ UUID assetID = UUID.Zero;
+ if (asset != null)
+ assetID = asset.FullID;
+
+ AssetDataCallback(assetID, asset);
+
+ }
}
}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index b039049ad6..a82eaaecb1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -27,26 +27,28 @@
using System;
using System.Threading;
+using System.Collections;
using System.Collections.Generic;
+using System.Reflection;
using OpenMetaverse;
using OpenMetaverse.Imaging;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;
using log4net;
-using System.Reflection;
namespace OpenSim.Region.ClientStack.LindenUDP
{
-
public class LLImageManager
{
-
- //Public interfaces:
- //Constructor - (LLClientView, IAssetCache, IJ2KDecoder);
- //void EnqueueReq - (TextureRequestArgs)
- //ProcessImageQueue
- //Close
+ private sealed class J2KImageComparer : IComparer
+ {
+ public int Compare(J2KImage x, J2KImage y)
+ {
+ return x.m_requestedPriority.CompareTo(y.m_requestedPriority);
+ }
+ }
+
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private bool m_shuttingdown = false;
private long m_lastloopprocessed = 0;
@@ -54,28 +56,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private LLClientView m_client; //Client we're assigned to
private IAssetService m_assetCache; //Asset Cache
private IJ2KDecoder m_j2kDecodeModule; //Our J2K module
+ private C5.IntervalHeap m_priorityQueue = new C5.IntervalHeap(10, new J2KImageComparer());
- private readonly AssetBase m_missingsubstitute; //Sustitute for bad decodes
- private Dictionary m_imagestore; // Our main image storage dictionary
- private SortedList m_priorities; // For fast image lookup based on priority
- private Dictionary m_priorityresolver; //Enabling super fast assignment of images with the same priorities
-
- private const double doubleMinimum = .0000001;
-
- public int m_outstandingtextures = 0;
- //Constructor
public LLImageManager(LLClientView client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule)
{
-
- m_imagestore = new Dictionary();
- m_priorities = new SortedList();
- m_priorityresolver = new Dictionary();
m_client = client;
m_assetCache = pAssetCache;
- if (pAssetCache != null)
- m_missingsubstitute = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f");
- else
- m_log.Error("[ClientView] - couldn't set missing image, all manner of things will probably break");
m_j2kDecodeModule = pJ2kDecodeModule;
}
@@ -88,174 +74,147 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//Make sure we're not shutting down..
if (!m_shuttingdown)
{
+ J2KImage imgrequest;
- //Do we already know about this UUID?
- if (m_imagestore.ContainsKey(newRequest.RequestedAssetID))
+ // Do a linear search for this texture download
+ m_priorityQueue.Find(delegate(J2KImage img) { return img.m_requestedUUID == newRequest.RequestedAssetID; }, out imgrequest);
+
+ if (imgrequest != null)
{
- //Check the packet sequence to make sure this isn't older than
- //one we've already received
-
- J2KImage imgrequest = m_imagestore[newRequest.RequestedAssetID];
-
- // This is the inbound request sequence number. We can ignore
- // "old" ones.
-
- if (newRequest.requestSequence > imgrequest.m_lastSequence)
+ if (newRequest.DiscardLevel == -1 && newRequest.Priority == 0f)
{
+ m_log.Debug("[JPEG2000]: (CAN) ID=" + newRequest.RequestedAssetID);
- imgrequest.m_lastSequence = newRequest.requestSequence;
+ try { m_priorityQueue.Delete(imgrequest.m_priorityQueueHandle); }
+ catch (Exception) { }
+ }
+ else
+ {
+ m_log.DebugFormat("[JPEG2000]: (UPD) ID={0}: D={1}, S={2}, P={3}",
+ newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
- //Check the priority
-
- double priority = imgrequest.m_requestedPriority;
- if (priority != newRequest.Priority)
+ //Check the packet sequence to make sure this isn't older than
+ //one we've already received
+ if (newRequest.requestSequence > imgrequest.m_lastSequence)
{
- //Remove the old priority
- m_priorities.Remove(imgrequest.m_designatedPriorityKey);
- //Assign a new unique priority
+ //Update the sequence number of the last RequestImage packet
+ imgrequest.m_lastSequence = newRequest.requestSequence;
+
+ //Update the requested discard level
+ imgrequest.m_requestedDiscardLevel = newRequest.DiscardLevel;
+
+ //Update the requested packet number
+ imgrequest.m_requestedPacketNumber = newRequest.PacketNumber;
+
+ //Update the requested priority
imgrequest.m_requestedPriority = newRequest.Priority;
- imgrequest.m_designatedPriorityKey = AssignPriority(newRequest.RequestedAssetID, newRequest.Priority);
- }
+ try { m_priorityQueue.Replace(imgrequest.m_priorityQueueHandle, imgrequest); }
+ catch (Exception) { imgrequest.m_priorityQueueHandle = null; m_priorityQueue.Add(ref imgrequest.m_priorityQueueHandle, imgrequest); }
- //Update the requested discard level
- imgrequest.m_requestedDiscardLevel = newRequest.DiscardLevel;
-
- //Update the requested packet number
- imgrequest.m_requestedPacketNumber = newRequest.PacketNumber;
-
- //Check if this will create an outstanding texture request
- bool activated = imgrequest.m_completedSendAtCurrentDiscardLevel;
- //Run an update
-
- imgrequest.RunUpdate();
-
- if (activated && !imgrequest.m_completedSendAtCurrentDiscardLevel && imgrequest.m_decoded)
- {
- Interlocked.Increment(ref m_outstandingtextures);
+ //Run an update
+ imgrequest.RunUpdate();
}
}
}
else
{
- J2KImage imgrequest = new J2KImage(this);
+ if (newRequest.DiscardLevel == -1 && newRequest.Priority == 0f)
+ {
+ m_log.DebugFormat("[JPEG2000]: (IGN) ID={0}: D={1}, S={2}, P={3}",
+ newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
+ }
+ else
+ {
+ m_log.DebugFormat("[JPEG2000]: (NEW) ID={0}: D={1}, S={2}, P={3}",
+ newRequest.RequestedAssetID, newRequest.DiscardLevel, newRequest.PacketNumber, newRequest.Priority);
- //Assign our missing substitute
- imgrequest.m_MissingSubstitute = m_missingsubstitute;
+ imgrequest = new J2KImage(this);
- //Assign our decoder module
- imgrequest.m_j2kDecodeModule = m_j2kDecodeModule;
+ //Assign our decoder module
+ imgrequest.m_j2kDecodeModule = m_j2kDecodeModule;
- //Assign our asset cache module
- imgrequest.m_assetCache = m_assetCache;
+ //Assign our asset cache module
+ imgrequest.m_assetCache = m_assetCache;
- //Assign a priority based on our request
- imgrequest.m_designatedPriorityKey = AssignPriority(newRequest.RequestedAssetID, newRequest.Priority);
+ //Assign the requested discard level
+ imgrequest.m_requestedDiscardLevel = newRequest.DiscardLevel;
- //Assign the requested discard level
- imgrequest.m_requestedDiscardLevel = newRequest.DiscardLevel;
+ //Assign the requested packet number
+ imgrequest.m_requestedPacketNumber = newRequest.PacketNumber;
- //Assign the requested packet number
- imgrequest.m_requestedPacketNumber = newRequest.PacketNumber;
+ //Assign the requested priority
+ imgrequest.m_requestedPriority = newRequest.Priority;
- //Assign the requested priority
- imgrequest.m_requestedPriority = newRequest.Priority;
+ //Assign the asset uuid
+ imgrequest.m_requestedUUID = newRequest.RequestedAssetID;
- //Assign the asset uuid
- imgrequest.m_requestedUUID = newRequest.RequestedAssetID;
+ //Assign the requested priority
+ imgrequest.m_requestedPriority = newRequest.Priority;
- m_imagestore.Add(imgrequest.m_requestedUUID, imgrequest);
-
- //Run an update
- imgrequest.RunUpdate();
+ //Add this download to the priority queue
+ m_priorityQueue.Add(ref imgrequest.m_priorityQueueHandle, imgrequest);
+ //Run an update
+ imgrequest.RunUpdate();
+ }
}
}
}
- private double AssignPriority(UUID pAssetID, double pPriority)
- {
-
- //First, find out if we can just assign directly
- if (m_priorityresolver.ContainsKey((int)pPriority) == false)
- {
- m_priorities.Add((double)((int)pPriority), pAssetID);
- m_priorityresolver.Add((int)pPriority, 0);
- return (double)((int)pPriority);
- }
- else
- {
- //Use the hash lookup goodness of a secondary dictionary to find a free slot
- double mFreePriority = ((int)pPriority) + (doubleMinimum * (m_priorityresolver[(int)pPriority] + 1));
- m_priorities[mFreePriority] = pAssetID;
- m_priorityresolver[(int)pPriority]++;
- return mFreePriority;
- }
-
-
-
- }
-
public bool ProcessImageQueue(int count, int maxpack)
{
+ //count is the number of textures we want to process in one go.
+ //As part of this class re-write, that number will probably rise
+ //since we're processing in a more efficient manner.
// this can happen during Close()
if (m_client == null)
return false;
-
- //Count is the number of textures we want to process in one go.
- //As part of this class re-write, that number will probably rise
- //since we're processing in a more efficient manner.
-
+
int numCollected = 0;
- //Calculate our threshold
- int threshold;
- if (m_lastloopprocessed == 0)
- {
- if (m_client.PacketHandler == null || m_client.PacketHandler.PacketQueue == null || m_client.PacketHandler.PacketQueue.TextureThrottle == null)
- return false;
- //This is decent for a semi fast machine, but we'll calculate it more accurately based on time below
- threshold = m_client.PacketHandler.PacketQueue.TextureThrottle.Current / 6300;
- m_lastloopprocessed = DateTime.Now.Ticks;
- }
- else
- {
- double throttleseconds = ((double)DateTime.Now.Ticks - (double)m_lastloopprocessed) / (double)TimeSpan.TicksPerSecond;
- throttleseconds = throttleseconds * m_client.PacketHandler.PacketQueue.TextureThrottle.Current;
-
- //Average of 1000 bytes per packet
- throttleseconds = throttleseconds / 1000;
-
- //Safe-zone multiplier of 2.0
- threshold = (int)(throttleseconds * 2.0);
- m_lastloopprocessed = DateTime.Now.Ticks;
-
- }
-
- if (threshold < 10)
- {
- threshold = 10;
- }
+ //Calculate our threshold
+ int threshold;
+ if (m_lastloopprocessed == 0)
+ {
+ if (m_client.PacketHandler == null || m_client.PacketHandler.PacketQueue == null || m_client.PacketHandler.PacketQueue.TextureThrottle == null)
+ return false;
+ //This is decent for a semi fast machine, but we'll calculate it more accurately based on time below
+ threshold = m_client.PacketHandler.PacketQueue.TextureThrottle.Current / 6300;
+ m_lastloopprocessed = DateTime.Now.Ticks;
+ }
+ else
+ {
+ double throttleseconds = ((double)DateTime.Now.Ticks - (double)m_lastloopprocessed) / (double)TimeSpan.TicksPerSecond;
+ throttleseconds = throttleseconds * m_client.PacketHandler.PacketQueue.TextureThrottle.Current;
- if (m_client.PacketHandler == null)
- return false;
+ //Average of 1000 bytes per packet
+ throttleseconds = throttleseconds / 1000;
- if (m_client.PacketHandler.PacketQueue == null)
- return false;
+ //Safe-zone multiplier of 2.0
+ threshold = (int)(throttleseconds * 2.0);
+ m_lastloopprocessed = DateTime.Now.Ticks;
- //First of all make sure our packet queue isn't above our threshold
+ }
+
+ if (m_client.PacketHandler == null)
+ return false;
+
+ if (m_client.PacketHandler.PacketQueue == null)
+ return false;
+
+ if (threshold < 10)
+ threshold = 10;
//Uncomment this to see what the texture stack is doing
- //m_log.Debug("Queue: " + m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount.ToString() + " Threshold: " + threshold.ToString() + " outstanding: " + m_outstandingtextures.ToString());
- if (m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount < threshold && m_outstandingtextures > 0)
- {
- bool justreset = false;
-
- for (int x = m_priorities.Count - 1; x > -1; x--)
+ //m_log.Debug("Queue: " + m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount.ToString() + " Threshold: " + threshold.ToString() + " outstanding: " + m_outstandingtextures.ToString());
+ if (m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount < threshold)
+ {
+ while (m_priorityQueue.Count > 0)
{
-
- J2KImage imagereq = m_imagestore[m_priorities.Values[x]];
- if (imagereq.m_decoded == true && !imagereq.m_completedSendAtCurrentDiscardLevel)
+ J2KImage imagereq = m_priorityQueue.FindMax();
+
+ if (imagereq.m_decoded == true)
{
// we need to test this here now that we are dropping assets
if (!imagereq.m_hasasset)
@@ -265,78 +224,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
continue;
}
- numCollected++;
+ ++numCollected;
+
//SendPackets will send up to ten packets per cycle
if (imagereq.SendPackets(m_client, maxpack))
{
- //Send complete
- if (!imagereq.m_completedSendAtCurrentDiscardLevel)
- {
- // I think this field imagereq.m_completedSendAtCurrentDiscardLevel
- // is completely redundant
- //imagereq.m_completedSendAtCurrentDiscardLevel = true;
-
- Interlocked.Decrement(ref m_outstandingtextures);
-
- // First and foremost, drop the reference to the asset
- // so that the asset doesn't stay in memory forever.
- // We'll Get it again from the asset service (usually cache)
- // if/when the client requests it again.
- // In order not to mess much with the current implementation
- // of this management code, we drop only the asset reference
- // but keep the image request itself.
- imagereq.DropAsset();
-
- //Re-assign priority to bottom
- //Remove the old priority
- m_priorities.Remove(imagereq.m_designatedPriorityKey);
- int lowest;
- if (m_priorities.Count > 0)
- {
- lowest = (int)m_priorities.Keys[0];
- lowest--;
- }
- else
- {
- lowest = -10000;
- }
- m_priorities.Add((double)lowest, imagereq.m_requestedUUID);
- imagereq.m_designatedPriorityKey = (double)lowest;
- if (m_priorityresolver.ContainsKey((int)lowest))
- {
- m_priorityresolver[(int)lowest]++;
- }
- else
- {
- m_priorityresolver.Add((int)lowest, 0);
- }
- }
- }
- if (numCollected == count)
- {
- break;
+ // Send complete. Destroy any knowledge of this transfer
+ try { m_priorityQueue.Delete(imagereq.m_priorityQueueHandle); }
+ catch (Exception) { }
}
}
- if (numCollected == count || m_outstandingtextures == 0)
+
+ if (numCollected == count)
break;
- if (numCollected % m_outstandingtextures == 0 && !justreset)
- {
- //We've gotten as much as we can from the stack,
- //reset to the top so that we can send MOAR DATA (nomnomnom)!
- x = m_priorities.Count - 1;
-
- justreset = true; //prevents us from getting stuck in a loop
- }
}
}
- return m_outstandingtextures != 0;
+ return m_priorityQueue.Count > 0;
}
//Faux destructor
public void Close()
{
-
+
m_shuttingdown = true;
m_j2kDecodeModule = null;
m_assetCache = null;
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index 49f7f48508..a0f359b629 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -161,7 +161,6 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
for (int i = 0; i < layerStarts.Count; i++)
{
OpenJPEG.J2KLayerInfo layer = new OpenJPEG.J2KLayerInfo();
- int start = layerStarts[i];
if (i == 0)
layer.Start = 0;
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index 0352c99e60..773de446bd 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -401,4 +401,11 @@
+
+
diff --git a/bin/assets/TexturesAssetSet/default_avatar.jp2 b/bin/assets/TexturesAssetSet/default_avatar.jp2
new file mode 100644
index 0000000000..116b860d80
Binary files /dev/null and b/bin/assets/TexturesAssetSet/default_avatar.jp2 differ