1 files changed, 41 insertions, 29 deletions

diff --git a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index 76c4899..e430fc7 100644
--- a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -24,51 +24,63 @@
  * (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 OpenMetaverse;
+using System;
+using System.Reflection;
+using System.Collections.Generic;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+using log4net;
 
-namespace OpenSim.Grid.MessagingServer.Modules
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
-    public class UserDataBaseService : UserManagerBase
+    public class UserAccountCache
     {
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// Passing null to parent because we never use any function that requires an interservice inventory call.
-        public UserDataBaseService()
-            : base(null)
+        //private static readonly ILog m_log =
+        //        LogManager.GetLogger(
+        //        MethodBase.GetCurrentMethod().DeclaringType);
+        
+        private ICnmCache<UUID, UserAccount> m_UUIDCache;
+        private Dictionary<string, UUID> m_NameCache;
+
+        public UserAccountCache()
         {
+            // Warning: the size values are a bit fuzzy. What matters
+            // most for this cache is the count value (128 entries).
+            m_UUIDCache = CnmSynchronizedCache<UUID, UserAccount>.Synchronized(new CnmMemoryCache<UUID, UserAccount>(
+                        128, 128*512, TimeSpan.FromMinutes(30.0)));
+            m_NameCache = new Dictionary<string, UUID>(); // this one is unbound
         }
-        
-        public UserAgentData GetUserAgentData(UUID AgentID)
+
+        public void Cache(UserAccount account)
         {
-            UserProfileData userProfile = GetUserProfile(AgentID);
+            m_UUIDCache.Set(account.PrincipalID, account, 512);
+            m_NameCache[account.Name] = account.PrincipalID;
+
+            //m_log.DebugFormat("[USER CACHE]: cached user {0} {1}", account.FirstName, account.LastName);
+        }
 
-            if (userProfile != null)
+        public UserAccount Get(UUID userID)
+        {
+            UserAccount account = null;
+            if (m_UUIDCache.TryGetValue(userID, out account))
             {
-                return userProfile.CurrentAgent;
+                //m_log.DebugFormat("[USER CACHE]: Account {0} {1} found in cache", account.FirstName, account.LastName);
+                return account;
             }
 
             return null;
         }
 
-        public override UserProfileData SetupMasterUser(string firstName, string lastName)
+        public UserAccount Get(string name)
         {
-            //throw new Exception("The method or operation is not implemented.");
-            return null;
-        }
+            if (!m_NameCache.ContainsKey(name))
+                return null;
 
-        public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
-        {
-            //throw new Exception("The method or operation is not implemented.");
-            return null;
-        }
+            UserAccount account = null;
+            if (m_UUIDCache.TryGetValue(m_NameCache[name], out account))
+                return account;
 
-        public override UserProfileData SetupMasterUser(UUID uuid)
-        {
-            //throw new Exception("The method or operation is not implemented.");
             return null;
         }
     }