ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Only count download requests for assets which are not already waiting for data from the asset server

Browse Source 
* 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
This commit is contained in:
Justin Clarke Casey
2008-02-20 20:23:03 +00:00
parent 684059afdf
commit 7d7ad4dff2
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@@ -249,6 +249,8 @@ namespace OpenSim.Framework.Communications.Cache
}
else
{
m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId);
NewAssetRequest req = new NewAssetRequest(assetId, callback);
// Make sure we always have a request list to which to add the asset
@@ -265,11 +267,10 @@ namespace OpenSim.Framework.Communications.Cache
}
}
m_log.DebugFormat("[ASSET CACHE]: Added request for {0} {1}", isTexture ? "texture" : "asset", assetId);
requestList.Requests.Add(req);
m_assetServer.RequestAsset(assetId, isTexture);
}
}
}
/// <summary>
@@ -383,7 +384,7 @@ namespace OpenSim.Framework.Communications.Cache
}
}
m_log.InfoFormat("[ASSET CACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result);
m_log.DebugFormat("[ASSET CACHE]: Adding {0} {1} [{2}]: {3}.", temporary, type, asset.FullID, result);
}
/// <summary>
@@ -411,7 +412,7 @@ namespace OpenSim.Framework.Communications.Cache
// See IAssetReceiver
public void AssetReceived(AssetBase asset, bool IsTexture)
{
m_log.InfoFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID);
m_log.DebugFormat("[ASSET CACHE]: Recieved {0} [{1}]", IsTexture ? "texture" : "asset", asset.FullID);
if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server
{
@@ -425,7 +426,7 @@ namespace OpenSim.Framework.Communications.Cache
TextureImage image = new TextureImage(asset);
if (Textures.ContainsKey(image.FullID))
{
m_log.InfoFormat("[ASSET CACHE]: There's already an texture {0} in memory. Skipping.", asset.FullID);
m_log.DebugFormat("[ASSET CACHE]: There's already an texture {0} in memory. Skipping.", asset.FullID);
}
else
{