From dc4f31db1a6bd97e0dd2819766e2b7905aa7c670 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sun, 10 May 2009 16:20:25 +0000 Subject: [PATCH] Create an async form of the RestObjectPoster. Rename the file (but not the class!) to SynchronousRestObjectRequester. Add CacheBuckets parameter to cache --- .../AsynchronousRestObjectRequester.cs | 126 ++++++++++++++++++ ...r.cs => SynchronousRestObjectRequester.cs} | 0 .../CoreModules/Asset/CoreAssetCache.cs | 2 +- 3 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs rename OpenSim/Framework/Servers/HttpServer/{SynchronousRestObjectPoster.cs => SynchronousRestObjectRequester.cs} (100%) diff --git a/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs b/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs new file mode 100644 index 0000000000..a63fd41ff5 --- /dev/null +++ b/OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs @@ -0,0 +1,126 @@ +/* + * 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 OpenSim 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.Net; +using System.Text; +using System.Xml; +using System.Xml.Serialization; + +namespace OpenSim.Framework.Servers.HttpServer +{ + public class AsynchronousRestObjectRequester + { + /// + /// Perform an asynchronous REST request. + /// + /// + /// + /// + /// + /// + /// + /// Thrown if we encounter a + /// network issue while posting the request. You'll want to make + /// sure you deal with this as they're not uncommon + // + public static void MakeRequest(string verb, + string requestUrl, TRequest obj, Action action) + { + Type type = typeof (TRequest); + + WebRequest request = WebRequest.Create(requestUrl); + WebResponse response = null; + TResponse deserial = default(TResponse); + XmlSerializer deserializer = new XmlSerializer(typeof (TResponse)); + + request.Method = verb; + + if (verb == "POST") + { + request.ContentType = "text/xml"; + + MemoryStream buffer = new MemoryStream(); + + XmlWriterSettings settings = new XmlWriterSettings(); + settings.Encoding = Encoding.UTF8; + + using (XmlWriter writer = XmlWriter.Create(buffer, settings)) + { + XmlSerializer serializer = new XmlSerializer(type); + serializer.Serialize(writer, obj); + writer.Flush(); + } + + int length = (int) buffer.Length; + request.ContentLength = length; + + request.BeginGetRequestStream(delegate(IAsyncResult res) + { + Stream requestStream = request.EndGetRequestStream(res); + + requestStream.Write(buffer.ToArray(), 0, length); + + request.BeginGetResponse(delegate(IAsyncResult ar) + { + response = request.EndGetResponse(ar); + + try + { + deserial = (TResponse) deserializer.Deserialize( + response.GetResponseStream()); + } + catch (System.InvalidOperationException) + { + } + + action(deserial); + }, null); + }, null); + + return; + } + + request.BeginGetResponse(delegate(IAsyncResult res2) + { + response = request.EndGetResponse(res2); + + try + { + deserial = (TResponse) deserializer.Deserialize( + response.GetResponseStream()); + } + catch (System.InvalidOperationException) + { + } + + action(deserial); + }, null); + } + } +} diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectPoster.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs similarity index 100% rename from OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectPoster.cs rename to OpenSim/Framework/Servers/HttpServer/SynchronousRestObjectRequester.cs diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs index 41d4bc6f3e..da156b637a 100644 --- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs @@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Asset m_log.Info("[ASSET CACHE]: Core asset cache enabled"); - m_Cache.Size = 32768; + m_Cache.Size = assetConfig.GetInt("CacheBuckets", 32768); } } }