1 files changed, 77 insertions, 26 deletions

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);
+                }
+            }
+        }
     }
 }