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

* Reducing spam on console so we only notify once if we're dropping repeated requests for missing textures 

* Also minor logic change so that we actually do retry missing texture requests (we weren't before)
0.6.0-stable
Justin Clarke Casey 2008-03-22 18:30:54 +00:00
parent 625e8f7700
commit 936f961a53
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
View File

@ -116,16 +116,19 @@ namespace OpenSim.Region.Environment.Modules
// requesting the same textures // requesting the same textures
if (missingTextureRequestCounts.ContainsKey(e.RequestedAssetID)) if (missingTextureRequestCounts.ContainsKey(e.RequestedAssetID))
{ {
int requests = missingTextureRequestCounts[e.RequestedAssetID] + 1; missingTextureRequestCounts[e.RequestedAssetID] += 1;
if (requests % 20 == 0) if (missingTextureRequestCounts[e.RequestedAssetID] > MAX_ALLOWED_TEXTURE_REQUESTS)
{ {
m_log.WarnFormat( if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == missingTextureRequestCounts[e.RequestedAssetID])
"[USER TEXTURE DOWNLOAD SERVICE]: Received {0} requests for the already notified missing texture {1} from {2}", {
requests, e.RequestedAssetID, m_client.AgentId); m_log.WarnFormat(
} "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for {1} since we have received more than {2} requests",
e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS);
missingTextureRequestCounts[e.RequestedAssetID] = requests; }
return;
}
} }
else else
{ {
@ -143,21 +146,21 @@ namespace OpenSim.Region.Environment.Modules
if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == dispatchedTextureRequestCounts[e.RequestedAssetID]) if (MAX_ALLOWED_TEXTURE_REQUESTS + 1 == dispatchedTextureRequestCounts[e.RequestedAssetID])
{ {
m_log.WarnFormat( m_log.WarnFormat(
"[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for dispatched texture {0} from {1} since we have received more than {2} requests", "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for dispatched texture {0} for {1} since we have received more than {2} requests",
e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS);
} }
return; return;
} }
} }
m_scene.AddPendingDownloads(1);
TextureSender requestHandler = new TextureSender(m_client, e.DiscardLevel, e.PacketNumber);
m_textureSenders.Add(e.RequestedAssetID, requestHandler);
m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true);
} }
m_scene.AddPendingDownloads(1);
TextureSender requestHandler = new TextureSender(m_client, e.DiscardLevel, e.PacketNumber);
m_textureSenders.Add(e.RequestedAssetID, requestHandler);
m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true);
} }
} }
} }
@ -193,14 +196,18 @@ namespace OpenSim.Region.Environment.Modules
// this on to the TextureSender it will blow up, so just discard for now. // this on to the TextureSender it will blow up, so just discard for now.
// Needs investigation. // Needs investigation.
if (texture == null || texture.Data == null) if (texture == null || texture.Data == null)
{ {
m_log.DebugFormat( if (!missingTextureRequestCounts.ContainsKey(textureID))
"[USER TEXTURE DOWNLOAD SERVICE]: Queueing TextureNotFoundSender for {0}, client {1}", {
textureID, m_client.AgentId); missingTextureRequestCounts.Add(textureID, 1);
m_log.DebugFormat(
"[USER TEXTURE DOWNLOAD SERVICE]: Queueing first TextureNotFoundSender for {0}, client {1}",
textureID, m_client.AgentId);
}
ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID); ITextureSender textureNotFoundSender = new TextureNotFoundSender(m_client, textureID);
EnqueueTextureSender(textureNotFoundSender); EnqueueTextureSender(textureNotFoundSender);
missingTextureRequestCounts.Add(textureID, 1);
} }
else else
{ {