Experimental alternative cache module implementation, using GlynnTucker.Cache.dll.

2 files changed, 127 insertions, 0 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
new file mode 100644
index 0000000..f0a43b0
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.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 log4net;

+using System;

+using System.IO;

+using System.Collections.Generic;

+using System.Reflection;

+using GlynnTucker.Cache;

+using Nini.Config;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using OpenSim.Services.Interfaces;

+

+namespace OpenSim.Region.CoreModules.Asset

+{

+    public class GlynnTuckerAssetCache : ISharedRegionModule, IImprovedAssetCache

+    {

+        private static readonly ILog m_log =

+                LogManager.GetLogger(

+                MethodBase.GetCurrentMethod().DeclaringType);

+

+        private bool m_Enabled = false;

+        private ICache m_Cache = new GlynnTucker.Cache.SimpleMemoryCache();

+

+        public string Name

+        {

+            get { return "GlynnTuckerAssetCache"; }

+        }

+

+        public void Initialise(IConfigSource source)

+        {

+            IConfig moduleConfig = source.Configs["Modules"];

+

+            if (moduleConfig != null)

+            {

+                string name = moduleConfig.GetString("AssetCaching", "GlynnTuckerAssetCache");

+                m_log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name);

+

+                if (name == Name)

+                {

+                    m_Enabled = true;

+

+                    m_log.Info("[ASSET CACHE]: GlynnTucker asset cache enabled");

+

+                }

+            }

+        }

+

+        public void PostInitialise()

+        {

+        }

+

+        public void Close()

+        {

+        }

+

+        public void AddRegion(Scene scene)

+        {

+            if (m_Enabled)

+                scene.RegisterModuleInterface<IImprovedAssetCache>(this);

+        }

+

+        public void RemoveRegion(Scene scene)

+        {

+        }

+

+        public void RegionLoaded(Scene scene)

+        {

+        }

+

+        ////////////////////////////////////////////////////////////

+        // IImprovedAssetCache

+        //

+

+        public void Cache(AssetBase asset)

+        {

+            if (asset != null)

+                m_Cache.AddOrUpdate(asset.ID, asset);

+        }

+

+        public AssetBase Get(string id)

+        {

+            Object asset = null;

+            m_Cache.TryGet(id, out asset);

+            return (AssetBase)asset;

+        }

+

+        public void Expire(string id)

+        {

+            Object asset = null;

+            if (m_Cache.TryGet(id, out asset))

+                m_Cache.Remove(id);

+        }

+

+        public void Clear()

+        {

+            m_Cache.Clear();

+        }

+    }

+}

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index bc0f4b5..393f340 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -18,6 +18,7 @@
         <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectors.Asset.RemoteAssetServicesConnector" />
         <RegionModule id="HGAssetBroker" type="OpenSim.Region.CoreModules.ServiceConnectors.Asset.HGAssetBroker" />
         <RegionModule id="CoreAssetCache" type="OpenSim.Region.CoreModules.Asset.CoreAssetCache" />
+        <RegionModule id="CoreAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" />
         <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" />
         <RegionModule id="Chat" type="OpenSim.Region.CoreModules.Avatar.Chat.ChatModule" />
     </Extension>