From 81bc38708ade851f2a0b8c44cd365c70dda6f6c6 Mon Sep 17 00:00:00 2001 From: diva Date: Mon, 27 Apr 2009 15:23:18 +0000 Subject: Thanks Tommil for a patch that adds a caching option to GetAssetStreamHandler. It is used in the RegionAssetService. --- .../Servers/CachedGetAssetStreamHandler.cs | 217 +++++++++++++++++++++ .../Framework/Services/RegionAssetService.cs | 23 ++- 2 files changed, 235 insertions(+), 5 deletions(-) create mode 100644 OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs diff --git a/OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs b/OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs new file mode 100644 index 0000000..7a9030c --- /dev/null +++ b/OpenSim/Framework/Servers/CachedGetAssetStreamHandler.cs @@ -0,0 +1,217 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.IO; +using System.Reflection; +using System.Text; +using System.Text.RegularExpressions; +using System.Xml; +using System.Xml.Serialization; +using log4net; +using OpenMetaverse; +using OpenSim.Data; +using OpenSim.Framework; +using OpenSim.Framework.Servers; +using OpenSim.Framework.Statistics; +using System.Net; + +namespace OpenSim.Framework.Servers +{ + public class CachedGetAssetStreamHandler : BaseStreamHandler + { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + + // private OpenAsset_Main m_assetManager; + private IAssetCache m_assetProvider; + + /// + /// Constructor. + /// + /// + /// + public CachedGetAssetStreamHandler(IAssetCache assetProvider) + : base("GET", "/assets") + { + m_log.Info("[REST]: In Get Request"); + // m_assetManager = assetManager; + m_assetProvider = assetProvider; + } + + public override byte[] Handle(string path, Stream request, + OSHttpRequest httpRequest, OSHttpResponse httpResponse) + { + string param = GetParam(path); + byte[] result = new byte[] { }; + + string[] p = param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries); + + if (p.Length > 0) + { + UUID assetID = UUID.Zero; + + if (!UUID.TryParse(p[0], out assetID)) + { + m_log.InfoFormat( + "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); + return result; + } + + if (StatsManager.AssetStats != null) + StatsManager.AssetStats.AddRequest(); + + AssetBase asset = m_assetProvider.GetAsset(assetID,true); // TODO IsTexture should be deduced from loaded asset. It is not used in this case. + + if (asset != null) + { +// if (asset.ContainsReferences) +// { +// asset.Data = ProcessOutgoingAssetData(asset.Data); +// } + if (p.Length > 1 && p[1] == "data") + { + httpResponse.StatusCode = (int)HttpStatusCode.OK; + httpResponse.ContentType = SLAssetTypeToContentType(asset.Type); + result = asset.Data; + } + else + { + XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); + MemoryStream ms = new MemoryStream(); + XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8); + xw.Formatting = Formatting.Indented; + xs.Serialize(xw, asset); + xw.Flush(); + + ms.Seek(0, SeekOrigin.Begin); + //StreamReader sr = new StreamReader(ms); + + result = ms.GetBuffer(); + + Array.Resize(ref result, (int)ms.Length); + } + } + else + { + if (StatsManager.AssetStats != null) + StatsManager.AssetStats.AddNotFoundRequest(); + + m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID); + } + } + + return result; + } + + // private byte[] ProcessOutgoingAssetData(byte[] assetData) + // { + // string data = Encoding.ASCII.GetString(assetData); + + // data = ProcessAssetDataString(data); + + // return Encoding.ASCII.GetBytes(data); + // } + + public string ProcessAssetDataString(string data) + { + Regex regex = new Regex("(creator_id|owner_id)\\s+(\\S+)"); + + // IUserService userService = null; + + data = regex.Replace(data, delegate(Match m) + { + string result = String.Empty; + +// string key = m.Groups[1].Captures[0].Value; +// +// string value = m.Groups[2].Captures[0].Value; +// +// Guid userUri; +// +// switch (key) +// { +// case "creator_id": +// userUri = new Guid(value); +// // result = "creator_url " + userService(userService, userUri); +// break; +// +// case "owner_id": +// userUri = new Guid(value); +// // result = "owner_url " + ResolveUserUri(userService, userUri); +// break; +// } + + return result; + }); + + return data; + } + + private string SLAssetTypeToContentType(int assetType) + { + switch (assetType) + { + case 0: + return "image/jp2"; + case 1: + return "application/ogg"; + case 2: + return "application/x-metaverse-callingcard"; + case 3: + return "application/x-metaverse-landmark"; + case 5: + return "application/x-metaverse-clothing"; + case 6: + return "application/x-metaverse-primitive"; + case 7: + return "application/x-metaverse-notecard"; + case 8: + return "application/x-metaverse-folder"; + case 10: + return "application/x-metaverse-lsl"; + case 11: + return "application/x-metaverse-lso"; + case 12: + return "image/tga"; + case 13: + return "application/x-metaverse-bodypart"; + case 17: + return "audio/x-wav"; + case 19: + return "image/jpeg"; + case 20: + return "application/x-metaverse-animation"; + case 21: + return "application/x-metaverse-gesture"; + case 22: + return "application/x-metaverse-simstate"; + default: + return "application/octet-stream"; + } + } + } +} diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs index 7fac319..dd0223a 100644 --- a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs +++ b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs @@ -45,7 +45,8 @@ namespace OpenSim.Region.CoreModules.Framework.Services private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static bool initialized = false; private static bool enabled = false; - + + private bool m_gridMode = false; Scene m_scene; #region IRegionModule interface @@ -58,9 +59,10 @@ namespace OpenSim.Region.CoreModules.Framework.Services m_scene = scene; // This module is only on for standalones in hypergrid mode - enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) && + enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) && config.Configs["Startup"].GetBoolean("hypergrid", true)) || ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true)); + m_gridMode = config.Configs["Startup"].GetBoolean("gridmode", true); } } @@ -70,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services { m_log.Info("[RegionAssetService]: Starting..."); - new AssetService(m_scene); + new AssetService(m_scene,m_gridMode); } } @@ -96,6 +98,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services { // private IUserService m_userService; private bool m_doLookup = false; + private bool m_gridMode = false; public bool DoLookup { @@ -105,8 +108,9 @@ namespace OpenSim.Region.CoreModules.Framework.Services // private static readonly ILog m_log // = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public AssetService(Scene m_scene) + public AssetService(Scene m_scene, bool gridMode) { + m_gridMode = gridMode; AddHttpHandlers(m_scene); // m_userService = m_scene.CommsManager.UserService; } @@ -117,7 +121,16 @@ namespace OpenSim.Region.CoreModules.Framework.Services = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin; IHttpServer httpServer = m_scene.CommsManager.HttpServer; - httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider)); + + if (m_gridMode) + { + httpServer.AddStreamHandler(new CachedGetAssetStreamHandler(m_scene.CommsManager.AssetCache)); + } + else + { + httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider)); + } + httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider)); } -- cgit v1.1