From 7d7ad4dff205faf64116defdc25f2d484cd04589 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 20 Feb 2008 20:23:03 +0000 Subject: * Only count download requests for assets which are not already waiting for data from the asset server * This should stop the constant increase in the download requests statistics * If you see stat numbers for download requests which are far from what you'd expect, please report --- .../Environment/Modules/UserTextureDownloadService.cs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs') diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs index 2f08bd6..bd5ee0b5 100644 --- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs @@ -42,8 +42,8 @@ namespace OpenSim.Region.Environment.Modules /// public class UserTextureDownloadService { - //private static readonly log4net.ILog m_log - // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly log4net.ILog m_log + = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); /// /// Holds texture senders before they have received the appropriate texture from the asset cache. @@ -81,16 +81,15 @@ namespace OpenSim.Region.Environment.Modules { if (m_textureSenders.TryGetValue(e.RequestedAssetID, out textureSender)) { - textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber); - - if ((textureSender.ImageLoaded) && - (textureSender.Sending == false)) - { - EnqueueTextureSender(textureSender); - } + // If we've received new non UUID information for this request and it hasn't dispatched + // yet, then update the request accordingly. + textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber); } else { + //m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Adding download stat {0}", e.RequestedAssetID); + m_scene.AddPendingDownloads(1); + TextureSender requestHandler = new TextureSender(client, e.DiscardLevel, e.PacketNumber); m_textureSenders.Add(e.RequestedAssetID, requestHandler); @@ -141,7 +140,7 @@ namespace OpenSim.Region.Environment.Modules // TODO Send packet back to the client telling it not to expect the texture // The absence of this packet doesn't appear to be causing it a problem right now - //m_log.InfoFormat("Removing {0} from pending downloads count", textureID); + //m_log.DebugFormat("[USER TEXTURE DOWNLOAD]: Removing download stat for {0}", textureID); m_scene.AddPendingDownloads(-1); } -- cgit v1.1