3 files changed, 186 insertions, 33 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index 6d4ac39..77fd70b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         #region ISharedRegionModule
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -129,6 +129,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             // FIXME: Why do we bother setting this module and caching up if we just end up registering the inner
             // user account service?!
             scene.RegisterModuleInterface<IUserAccountService>(UserAccountService);
+            scene.RegisterModuleInterface<IUserAccountCacheModule>(m_Cache);
         }
 
         public void RemoveRegion(Scene scene)
@@ -152,7 +153,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         public UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
             bool inCache = false;
-            UserAccount account = m_Cache.Get(userID, out inCache);
+            UserAccount account;
+            account = m_Cache.Get(userID, out inCache);
             if (inCache)
                 return account;
 
@@ -165,7 +167,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
         {
             bool inCache = false;
-            UserAccount account = m_Cache.Get(firstName + " " + lastName, out inCache);
+            UserAccount account;
+            account = m_Cache.Get(firstName + " " + lastName, out inCache);
             if (inCache)
                 return account;
 
@@ -181,6 +184,50 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             return UserAccountService.GetUserAccount(scopeID, Email);
         }
 
+        public List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs)
+        {
+            List<UserAccount> ret = new List<UserAccount>();
+            List<string> missing = new List<string>();
+
+            // still another cache..
+            bool inCache = false;
+            UUID uuid = UUID.Zero;
+            UserAccount account;
+            foreach(string id in IDs)
+            {
+                if(UUID.TryParse(id, out uuid))
+                {
+                    account = m_Cache.Get(uuid, out inCache);
+                    if (inCache)
+                        ret.Add(account);
+                    else
+                        missing.Add(id);
+                }
+            }
+
+            if(missing.Count == 0)
+                return ret;
+
+            List<UserAccount> ext = UserAccountService.GetUserAccounts(scopeID, missing);
+            if(ext != null && ext.Count > 0)
+            {
+                foreach(UserAccount acc in ext)
+                {
+                    if(acc != null)
+                    {
+                        ret.Add(acc);
+                        m_Cache.Cache(acc.PrincipalID, acc);
+                    }
+                }
+            }
+            return ret;
+        }
+
+        public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
+        {
+            return null;
+        }
+
         public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
         {
             return UserAccountService.GetUserAccounts(scopeID, query);
@@ -203,4 +250,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index 5aa87d3..b510d0a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -26,6 +26,8 @@
  */
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using Nini.Config;
 using log4net;
 using Mono.Addins;
@@ -34,6 +36,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors;
+using OpenSim.Framework;
 
 using OpenMetaverse;
 
@@ -50,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         private bool m_Enabled = false;
         private UserAccountCache m_Cache;
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -103,6 +106,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                 return;
 
             scene.RegisterModuleInterface<IUserAccountService>(this);
+            scene.RegisterModuleInterface<IUserAccountCacheModule>(m_Cache);
+
+            scene.EventManager.OnNewClient += OnNewClient;
         }
 
         public void RemoveRegion(Scene scene)
@@ -117,12 +123,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                 return;
         }
 
+        // When a user actually enters the sim, clear them from
+        // cache so the sim will have the current values for
+        // flags, title, etc. And country, don't forget country!
+        private void OnNewClient(IClientAPI client)
+        {
+            m_Cache.Remove(client.Name);
+        }
+
         #region Overwritten methods from IUserAccountService
 
         public override UserAccount GetUserAccount(UUID scopeID, UUID userID)
         {
             bool inCache = false;
-            UserAccount account = m_Cache.Get(userID, out inCache);
+            UserAccount account;
+            account = m_Cache.Get(userID, out inCache);
             if (inCache)
                 return account;
 
@@ -135,7 +150,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
         public override UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
         {
             bool inCache = false;
-            UserAccount account = m_Cache.Get(firstName + " " + lastName, out inCache);
+            UserAccount account;
+            account = m_Cache.Get(firstName + " " + lastName, out inCache);
             if (inCache)
                 return account;
 
@@ -146,6 +162,45 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             return account;
         }
 
+        public override List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs)
+        {
+            List<UserAccount> accs = new List<UserAccount>();
+            List<string> missing = new List<string>();
+
+            UUID uuid = UUID.Zero;
+            UserAccount account;
+            bool inCache = false;
+
+            foreach(string id in IDs)
+            {
+                if(UUID.TryParse(id, out uuid))
+                {
+                    account = m_Cache.Get(uuid, out inCache);
+                    if (inCache)
+                        accs.Add(account);
+                    else
+                        missing.Add(id);
+                }
+            }
+
+            if(missing.Count > 0)
+            {
+                List<UserAccount> ext = base.GetUserAccounts(scopeID, missing);
+                if(ext != null && ext.Count >0 )
+                {
+                    foreach(UserAccount acc in ext)
+                    {
+                        if(acc != null)
+                        {
+                            accs.Add(acc);
+                            m_Cache.Cache(acc.PrincipalID, acc);
+                        }
+                    }
+                }
+            }
+            return accs;
+        }
+
         public override bool StoreUserAccount(UserAccount data)
         {
             // This remote connector refuses to serve this method
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index ed52e48..f3572a2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -34,68 +34,119 @@ using log4net;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
-    public class UserAccountCache
+    public class UserAccountCache : IUserAccountCacheModule
     {
-        private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
+        private const double CACHE_ALIEN_EXPIRATION_SECONDS = 172800; // 48 hours
+        private const double CACHE_EXPIRATION_SECONDS = 3600.0; // 1 hour!
+        private const double CACHE_NULL_EXPIRATION_SECONDS = 600; // 10minutes
 
 //        private static readonly ILog m_log =
 //                LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private ExpiringCache<UUID, UserAccount> m_UUIDCache;
         private ExpiringCache<string, UUID> m_NameCache;
+        private object accessLock = new object();
 
         public UserAccountCache()
         {
             m_UUIDCache = new ExpiringCache<UUID, UserAccount>();
-            m_NameCache = new ExpiringCache<string, UUID>(); 
+            m_NameCache = new ExpiringCache<string, UUID>();
         }
 
         public void Cache(UUID userID, UserAccount account)
         {
             // Cache even null accounts
-            m_UUIDCache.AddOrUpdate(userID, account, CACHE_EXPIRATION_SECONDS);
-            if (account != null)
-                m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_EXPIRATION_SECONDS);
-
+            lock(accessLock)
+            {
+                if (account == null)
+                    m_UUIDCache.AddOrUpdate(userID, null, CACHE_NULL_EXPIRATION_SECONDS);
+                else if(account.LocalToGrid)
+                {
+                    m_UUIDCache.AddOrUpdate(userID, account, CACHE_EXPIRATION_SECONDS);
+                    m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_EXPIRATION_SECONDS);
+                }
+                else
+                {
+                    m_UUIDCache.AddOrUpdate(userID, account, CACHE_ALIEN_EXPIRATION_SECONDS);
+                    m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_ALIEN_EXPIRATION_SECONDS);
+                }
             //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
+            }
         }
 
-        public void Invalidate(UUID userID)
-        {
-            m_UUIDCache.Remove(userID);
-        }
 
         public UserAccount Get(UUID userID, out bool inCache)
         {
             UserAccount account = null;
             inCache = false;
-            if (m_UUIDCache.TryGetValue(userID, out account))
+            lock(accessLock)
             {
-                //m_log.DebugFormat("[USER CACHE]: Account {0} {1} found in cache", account.FirstName, account.LastName);
-                inCache = true;
-                return account;
+                if (m_UUIDCache.TryGetValue(userID, out account))
+                {
+                    //m_log.DebugFormat("[USER CACHE]: Account {0} {1} found in cache", account.FirstName, account.LastName);
+                    inCache = true;
+                    return account;
+                }
             }
-
             return null;
         }
 
         public UserAccount Get(string name, out bool inCache)
         {
             inCache = false;
-            if (!m_NameCache.Contains(name))
-                return null;
+            lock(accessLock)
+            {
+                if (!m_NameCache.Contains(name))
+                    return null;
 
-            UserAccount account = null;
-            UUID uuid = UUID.Zero;
-            if (m_NameCache.TryGetValue(name, out uuid))
-                if (m_UUIDCache.TryGetValue(uuid, out account))
+                UserAccount account = null;
+                UUID uuid = UUID.Zero;
+                if (m_NameCache.TryGetValue(name, out uuid))
                 {
-                    inCache = true;
-                    return account;
+                    if (m_UUIDCache.TryGetValue(uuid, out account))
+                    {
+                        inCache = true;
+                        return account;
+                    }
                 }
-
+            }
             return null;
         }
+
+        public void Invalidate(UUID userID)
+        {
+                m_UUIDCache.Remove(userID);
+        }
+
+        public void Remove(UUID id)
+        {
+            lock(accessLock)
+            {
+                if (!m_UUIDCache.Contains(id))
+                    return;
+
+                UserAccount account = null;
+                if (m_UUIDCache.TryGetValue(id, out account) && account != null)
+                    m_NameCache.Remove(account.Name);
+                m_UUIDCache.Remove(id);
+            }
+        }
+
+        public void Remove(string name)
+        {
+            lock(accessLock)
+            {
+                if (!m_NameCache.Contains(name))
+                    return;
+
+                UUID uuid = UUID.Zero;
+                if (m_NameCache.TryGetValue(name, out uuid))
+                {
+                    m_NameCache.Remove(name);
+                    m_UUIDCache.Remove(uuid);
+                }
+            }
+        }
     }
 }