diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs deleted file mode 100644 index abe9b23770..0000000000 --- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs +++ /dev/null @@ -1,172 +0,0 @@ -/* - * 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 log4net; -using System; -using System.IO; -using System.Collections.Generic; -using System.Reflection; -using GlynnTucker.Cache; -using Mono.Addins; -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 -{ - [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GlynnTuckerAssetCache")] - public class GlynnTuckerAssetCache : ISharedRegionModule, IAssetCache - { - private static readonly ILog m_log = - LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); - - private bool m_Enabled; - private ICache m_Cache; - private ulong m_Hits; - private ulong m_Requests; - - // Instrumentation - private uint m_DebugRate; - - public Type ReplaceableInterface - { - get { return null; } - } - - public string Name - { - get { return "GlynnTuckerAssetCache"; } - } - - public void Initialise(IConfigSource source) - { - IConfig moduleConfig = source.Configs["Modules"]; - - if (moduleConfig != null) - { - string name = moduleConfig.GetString("AssetCaching"); - //m_log.DebugFormat("[ASSET CACHE] name = {0} (this module's name: {1}). Sync? ", name, Name, m_Cache.IsSynchronized); - - if (name == Name) - { - m_Cache = new GlynnTucker.Cache.SimpleMemoryCache(); - m_Enabled = true; - - m_log.Info("[ASSET CACHE]: GlynnTucker asset cache enabled"); - - // Instrumentation - IConfig cacheConfig = source.Configs["AssetCache"]; - if (cacheConfig != null) - m_DebugRate = (uint)cacheConfig.GetInt("DebugRate", 0); - } - } - } - - public void PostInitialise() - { - } - - public void Close() - { - } - - public void AddRegion(Scene scene) - { - if (m_Enabled) - scene.RegisterModuleInterface(this); - } - - public void RemoveRegion(Scene scene) - { - } - - public void RegionLoaded(Scene scene) - { - } - - //////////////////////////////////////////////////////////// - // IAssetCache - // - - public bool Check(string id) - { - return m_Cache.Contains(id); - } - - public void Cache(AssetBase asset) - { - if (asset != null) - m_Cache.AddOrUpdate(asset.ID, asset); - } - - public void CacheNegative(string id) - { - // We don't do negative caching - } - - public bool Get(string id, out AssetBase asset) - { - Object a = null; - m_Cache.TryGet(id, out a); - - Debug(a); - - asset = (AssetBase)a; - return true; - } - - 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(); - } - - private void Debug(Object asset) - { - // Temporary instrumentation to measure the hit/miss rate - if (m_DebugRate > 0) - { - ++m_Requests; - if (asset != null) - ++m_Hits; - - if ((m_Requests % m_DebugRate) == 0) - m_log.DebugFormat("[ASSET CACHE]: Hit Rate {0} / {1} == {2}%", m_Hits, m_Requests, ((float)m_Hits / (float)m_Requests) * 100.0f); - } - // End instrumentation - } - } -} diff --git a/bin/GlynnTucker.Cache.dll b/bin/GlynnTucker.Cache.dll deleted file mode 100755 index c6ab8d59ca..0000000000 Binary files a/bin/GlynnTucker.Cache.dll and /dev/null differ diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index e93ce3c7f3..4b1914b50a 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -63,8 +63,6 @@ ;AssetCaching = "CenomeMemoryAssetCache" ;Include-CenomeCache = "config-include/CenomeCache.ini" - ;AssetCaching = "GlynnTuckerAssetCache" - ;; Optionally, the port for the LLProxyLoginModule module can be changed ;Setup_LLProxyLoginModule = "9090/" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 89315572b9..a4be88e9e4 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -64,8 +64,6 @@ ;AssetCaching = "CenomeMemoryAssetCache" ;Include-CenomeCache = "config-include/CenomeCache.ini" - ;AssetCaching = "GlynnTuckerAssetCache" - ;; Authorization is not on by default, as it depends on external php ;AuthorizationServices = "LocalAuthorizationServicesConnector" diff --git a/prebuild.xml b/prebuild.xml index f0721c4df2..3c8dcdb747 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1631,8 +1631,6 @@ - -