From 3234472d6203671a492a73042a0b56d6301903e0 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 19 Nov 2008 06:15:21 +0000
Subject: Reverting the texture sending patch and the new libOMV. This makes
this release a direct descendant of the stable 7364, with all the features
and none of the issues. This omits the following patch chain: r7383 r7382
r7381 r7377 r7375 r7373 r7372 r7370 r7369 r7368 r7367 r7366
---
.../Modules/Agent/TextureSender/TextureSender.cs | 307 +++++++--------------
1 file changed, 100 insertions(+), 207 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules/Agent/TextureSender')
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index 65ca854..cd61798 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -27,188 +27,106 @@
using System;
using System.Reflection;
+using OpenMetaverse.Packets;
using log4net;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;
namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
{
- public class ImageDownload
+ ///
+ /// A TextureSender handles the process of receiving a texture requested by the client from the
+ /// AssetCache, and then sending that texture back to the client.
+ ///
+ public class TextureSender : ITextureSender
{
- public const int FIRST_IMAGE_PACKET_SIZE = 600;
- public const int IMAGE_PACKET_SIZE = 1000;
-
- public OpenMetaverse.AssetTexture Texture;
- public int DiscardLevel;
- public float Priority;
- public int CurrentPacket;
- public int StopPacket;
-
- public ImageDownload(OpenMetaverse.AssetTexture texture, int discardLevel, float priority, int packet)
- {
- Texture = texture;
- Update(discardLevel, priority, packet);
- }
-
- ///
- /// Updates an image transfer with new information and recalculates
- /// offsets
- ///
- /// New requested discard level
- /// New requested priority
- /// New requested packet offset
- public void Update(int discardLevel, float priority, int packet)
- {
- Priority = priority;
- DiscardLevel = Clamp(discardLevel, 0, Texture.LayerInfo.Length - 1);
- StopPacket = GetPacketForBytePosition(Texture.LayerInfo[(Texture.LayerInfo.Length - 1) - DiscardLevel].End);
- CurrentPacket = Clamp(packet, 1, TexturePacketCount());
- }
-
- ///
- /// Returns the total number of packets needed to transfer this texture,
- /// including the first packet of size FIRST_IMAGE_PACKET_SIZE
- ///
- /// Total number of packets needed to transfer this texture
- public int TexturePacketCount()
- {
- return ((Texture.AssetData.Length - FIRST_IMAGE_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE) + 1;
- }
+ private static readonly ILog m_log
+ = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
///
- /// Returns the current byte offset for this transfer, calculated from
- /// the CurrentPacket
+ /// Records the number of times texture send has been called.
///
- /// Current byte offset for this transfer
- public int CurrentBytePosition()
- {
- return FIRST_IMAGE_PACKET_SIZE + (CurrentPacket - 1) * IMAGE_PACKET_SIZE;
- }
+ public int counter = 0;
- ///
- /// Returns the size, in bytes, of the last packet. This will be somewhere
- /// between 1 and IMAGE_PACKET_SIZE bytes
- ///
- /// Size of the last packet in the transfer
- public int LastPacketSize()
- {
- return Texture.AssetData.Length - (FIRST_IMAGE_PACKET_SIZE + ((TexturePacketCount() - 2) * IMAGE_PACKET_SIZE));
- }
+ public bool ImageLoaded = false;
///
- /// Find the packet number that contains a given byte position
+ /// Holds the texture asset to send.
///
- /// Byte position
- /// Packet number that contains the given byte position
- int GetPacketForBytePosition(int bytePosition)
- {
- return ((bytePosition - FIRST_IMAGE_PACKET_SIZE + IMAGE_PACKET_SIZE - 1) / IMAGE_PACKET_SIZE);
- }
+ private AssetBase m_asset;
- ///
- /// Clamp a given value between a range
- ///
- /// Value to clamp
- /// Minimum allowable value
- /// Maximum allowable value
- /// A value inclusively between lower and upper
- static int Clamp(int value, int min, int max)
- {
- // First we check to see if we're greater than the max
- value = (value > max) ? max : value;
+ //public UUID assetID { get { return m_asset.FullID; } }
- // Then we check to see if we're less than the min.
- value = (value < min) ? min : value;
+ // private bool m_cancel = false;
- // There's no check to see if min > max.
- return value;
- }
- }
+ // See ITextureSender
- ///
- /// A TextureSender handles the process of receiving a texture requested by the client from the
- /// AssetCache, and then sending that texture back to the client.
- ///
- public class TextureSender : ITextureSender
- {
- private static readonly ILog m_log
- = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ // private bool m_sending = false;
- public bool ImageLoaded = false;
+ ///
+ /// This is actually the number of extra packets required to send the texture data! We always assume
+ /// at least one is required.
+ ///
+ private int NumPackets = 0;
///
- /// Holds the texture asset to send.
+ /// Holds the packet number to send next. In this case, each packet is 1000 bytes long and starts
+ /// at the 600th byte (0th indexed).
///
- private AssetBase m_asset;
- private bool m_cancel = false;
- private bool m_sending = false;
- private bool sendFirstPacket = false;
- private int initialDiscardLevel = 0;
- private int initialPacketNum = 0;
- private float initialPriority = 0.0f;
+ private int PacketCounter = 0;
- private ImageDownload download;
+ private int RequestedDiscardLevel = -1;
private IClientAPI RequestUser;
+ private uint StartPacketNumber = 0;
- public TextureSender(IClientAPI client, int discardLevel, uint packetNumber, float priority)
+ public TextureSender(IClientAPI client, int discardLevel, uint packetNumber)
{
RequestUser = client;
- initialDiscardLevel = discardLevel;
- initialPacketNum = (int)packetNumber;
- initialPriority = priority;
+ RequestedDiscardLevel = discardLevel;
+ StartPacketNumber = packetNumber;
}
#region ITextureSender Members
public bool Cancel
{
- get { return m_cancel; }
- set { m_cancel = value; }
+ get { return false; }
+ set
+ {
+ // m_cancel = value;
+ }
}
public bool Sending
{
- get { return m_sending; }
- set { m_sending = value; }
+ get { return false; }
+ set
+ {
+ // m_sending = value;
+ }
}
// See ITextureSender
public void UpdateRequest(int discardLevel, uint packetNumber)
{
- if (download == null)
- return;
-
- lock (download)
- {
- if (discardLevel < download.DiscardLevel)
- m_log.DebugFormat("Image download {0} is changing from DiscardLevel {1} to {2}",
- m_asset.FullID, download.DiscardLevel, discardLevel);
-
- if (packetNumber != download.CurrentPacket)
- m_log.DebugFormat("Image download {0} is changing from Packet {1} to {2}",
- m_asset.FullID, download.CurrentPacket, packetNumber);
-
- download.Update(discardLevel, download.Priority, (int)packetNumber);
-
- sendFirstPacket = true;
- }
+ RequestedDiscardLevel = discardLevel;
+ StartPacketNumber = packetNumber;
+ PacketCounter = (int) StartPacketNumber;
}
// See ITextureSender
public bool SendTexturePacket()
{
- if (download != null && !m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket))
- {
- SendPacket();
- return false;
- }
- else
+ //m_log.DebugFormat("[TEXTURE SENDER]: Sending packet for {0}", m_asset.FullID);
+
+ SendPacket();
+ counter++;
+ if ((NumPackets == 0) || (RequestedDiscardLevel == -1) || (PacketCounter > NumPackets) ||
+ ((RequestedDiscardLevel > 0) && (counter > 50 + (NumPackets / (RequestedDiscardLevel + 1)))))
{
- m_sending = false;
- m_cancel = true;
- sendFirstPacket = false;
return true;
}
+ return false;
}
#endregion
@@ -222,52 +140,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
public void TextureReceived(AssetBase asset)
{
m_asset = asset;
-
- try
- {
- OpenMetaverse.AssetTexture texture = new OpenMetaverse.AssetTexture(m_asset.FullID, m_asset.Data);
- if (texture.DecodeLayerBoundaries())
- {
- bool sane = true;
-
- // Sanity check all of the layers
- for (int i = 0; i < texture.LayerInfo.Length; i++)
- {
- if (texture.LayerInfo[i].End > texture.AssetData.Length)
- {
- sane = false;
- break;
- }
- }
-
- if (sane)
- {
- download = new ImageDownload(texture, initialDiscardLevel, initialPriority, initialPacketNum);
- ImageLoaded = true;
- m_sending = true;
- m_cancel = false;
- sendFirstPacket = true;
- return;
- }
- else
- {
- m_log.Error("JPEG2000 texture decoding succeeded, but sanity check failed for " +
- m_asset.FullID.ToString());
- }
- }
- else
- {
- m_log.Error("JPEG2000 texture decoding failed for " + m_asset.FullID.ToString());
- }
- }
- catch (Exception ex)
- {
- m_log.Error("JPEG2000 texture decoding threw an exception for " + m_asset.FullID.ToString(), ex);
- }
-
- ImageLoaded = false;
- m_sending = false;
- m_cancel = true;
+ NumPackets = CalculateNumPackets(asset.Data.Length);
+ PacketCounter = (int) StartPacketNumber;
+ ImageLoaded = true;
}
///
@@ -275,48 +150,66 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
///
private void SendPacket()
{
- lock (download)
+ if (PacketCounter <= NumPackets)
{
- if (sendFirstPacket)
+ if (PacketCounter == 0)
{
- sendFirstPacket = false;
-
- if (m_asset.Data.Length <= ImageDownload.FIRST_IMAGE_PACKET_SIZE)
+ if (NumPackets == 0)
{
RequestUser.SendImageFirstPart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2);
- return;
+ PacketCounter++;
}
else
{
- byte[] firstImageData = new byte[ImageDownload.FIRST_IMAGE_PACKET_SIZE];
- try { Buffer.BlockCopy(m_asset.Data, 0, firstImageData, 0, ImageDownload.FIRST_IMAGE_PACKET_SIZE); }
- catch (Exception)
- {
- m_log.Error("Texture data copy failed on first packet for " + m_asset.FullID.ToString());
- m_cancel = true;
- m_sending = false;
- return;
- }
- RequestUser.SendImageFirstPart((ushort)download.TexturePacketCount(), m_asset.FullID, (uint)m_asset.Data.Length, firstImageData, 2);
+ byte[] ImageData1 = new byte[600];
+ Array.Copy(m_asset.Data, 0, ImageData1, 0, 600);
+
+ RequestUser.SendImageFirstPart(
+ (ushort)(NumPackets), m_asset.FullID, (uint)m_asset.Data.Length, ImageData1, 2);
+ PacketCounter++;
}
}
-
- int imagePacketSize = (download.CurrentPacket == download.TexturePacketCount() - 1) ?
- download.LastPacketSize() : ImageDownload.IMAGE_PACKET_SIZE;
-
- byte[] imageData = new byte[imagePacketSize];
- try { Buffer.BlockCopy(m_asset.Data, download.CurrentBytePosition(), imageData, 0, imagePacketSize); }
- catch (Exception)
+ else
{
- m_log.Error("Texture data copy failed for " + m_asset.FullID.ToString());
- m_cancel = true;
- m_sending = false;
- return;
+ int size = m_asset.Data.Length - 600 - (1000 * (PacketCounter - 1));
+ if (size > 1000) size = 1000;
+ byte[] imageData = new byte[size];
+ try
+ {
+ Array.Copy(m_asset.Data, 600 + (1000 * (PacketCounter - 1)), imageData, 0, size);
+ }
+ catch (ArgumentOutOfRangeException)
+ {
+ m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" +
+ m_asset.FullID.ToString());
+ return;
+ }
+
+ RequestUser.SendImageNextPart((ushort)PacketCounter, m_asset.FullID, imageData);
+ PacketCounter++;
}
+ }
+ }
- RequestUser.SendImageNextPart((ushort)download.CurrentPacket, m_asset.FullID, imageData);
- ++download.CurrentPacket;
+ ///
+ /// Calculate the number of packets that will be required to send the texture loaded into this sender
+ /// This is actually the number of 1000 byte packets not including an initial 600 byte packet...
+ ///
+ ///
+ ///
+ private int CalculateNumPackets(int length)
+ {
+ int numPackets = 0;
+
+ if (length > 600)
+ {
+ //over 600 bytes so split up file
+ int restData = (length - 600);
+ int restPackets = ((restData + 999) / 1000);
+ numPackets = restPackets;
}
+
+ return numPackets;
}
}
}
--
cgit v1.1