diff options
author | Justin Clarke Casey | 2008-09-21 20:44:54 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-21 20:44:54 +0000 |
commit | 3782d6aab74278996360e6b3e0762a7f6f105495 (patch) | |
tree | 61cb2ef2c0c2d46d1a0bca4be2001ee28fdd7c90 | |
parent | * Start recording asset request times after a cache miss. This is very primt... (diff) | |
download | opensim-SC-3782d6aab74278996360e6b3e0762a7f6f105495.zip opensim-SC-3782d6aab74278996360e6b3e0762a7f6f105495.tar.gz opensim-SC-3782d6aab74278996360e6b3e0762a7f6f105495.tar.bz2 opensim-SC-3782d6aab74278996360e6b3e0762a7f6f105495.tar.xz |
* minor: Remove some of the redundant asset id storage for now
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 9c73587..32a6c7d 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -253,7 +253,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
253 | { | 253 | { |
254 | // m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId); | 254 | // m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId); |
255 | 255 | ||
256 | NewAssetRequest req = new NewAssetRequest(assetId, callback); | 256 | NewAssetRequest req = new NewAssetRequest(callback); |
257 | AssetRequestsList requestList; | 257 | AssetRequestsList requestList; |
258 | 258 | ||
259 | lock (RequestLists) | 259 | lock (RequestLists) |
@@ -267,7 +267,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
267 | else | 267 | else |
268 | { | 268 | { |
269 | // m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId); | 269 | // m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId); |
270 | requestList = new AssetRequestsList(assetId); | 270 | requestList = new AssetRequestsList(); |
271 | requestList.TimeRequested = DateTime.Now; | 271 | requestList.TimeRequested = DateTime.Now; |
272 | requestList.Requests.Add(req); | 272 | requestList.Requests.Add(req); |
273 | 273 | ||
@@ -675,30 +675,31 @@ namespace OpenSim.Framework.Communications.Cache | |||
675 | } | 675 | } |
676 | } | 676 | } |
677 | 677 | ||
678 | /// <summary> | ||
679 | /// A list of requests for a particular asset. | ||
680 | /// </summary> | ||
678 | public class AssetRequestsList | 681 | public class AssetRequestsList |
679 | { | 682 | { |
680 | public UUID AssetID; | 683 | /// <summary> |
684 | /// A list of requests for assets | ||
685 | /// </summary> | ||
681 | public List<NewAssetRequest> Requests = new List<NewAssetRequest>(); | 686 | public List<NewAssetRequest> Requests = new List<NewAssetRequest>(); |
682 | 687 | ||
683 | /// <summary> | 688 | /// <summary> |
684 | /// Record the time that this request was first made. | 689 | /// Record the time that this request was first made. |
685 | /// </summary> | 690 | /// </summary> |
686 | public DateTime TimeRequested; | 691 | public DateTime TimeRequested; |
687 | |||
688 | public AssetRequestsList(UUID assetID) | ||
689 | { | ||
690 | AssetID = assetID; | ||
691 | } | ||
692 | } | 692 | } |
693 | 693 | ||
694 | /// <summary> | ||
695 | /// Represent a request for an asset that has yet to be fulfilled. | ||
696 | /// </summary> | ||
694 | public class NewAssetRequest | 697 | public class NewAssetRequest |
695 | { | 698 | { |
696 | public UUID AssetID; | ||
697 | public AssetRequestCallback Callback; | 699 | public AssetRequestCallback Callback; |
698 | 700 | ||
699 | public NewAssetRequest(UUID assetID, AssetRequestCallback callback) | 701 | public NewAssetRequest(AssetRequestCallback callback) |
700 | { | 702 | { |
701 | AssetID = assetID; | ||
702 | Callback = callback; | 703 | Callback = callback; |
703 | } | 704 | } |
704 | } | 705 | } |