add AddOrUpdate to ExpiringKey

Update AvatarFactoryModule.cs

OpenSim/Framework/ExpiringKey.cs

@@ -28,6 +28,7 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 using Timer = System.Threading.Timer ;
+using System.Runtime.InteropServices;
 
 namespace OpenSim.Framework
 {
@@ -168,6 +169,28 @@ namespace OpenSim.Framework
             finally { m_rwLock.ExitWriteLock(); }
         }
 
+        public bool AddOrUpdate(Tkey1 key, int expireMS)
+        {
+            int now;
+            if (expireMS > 0)
+            {
+                expireMS = (expireMS > m_expire) ? expireMS : m_expire;
+                now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
+            }
+            else
+                now = int.MinValue;
+
+            m_rwLock.EnterWriteLock();
+            try
+            {
+                ref int entry = ref CollectionsMarshal.GetValueRefOrAddDefault(m_dictionary, key, out bool exists);
+                entry = now;
+                CheckTimer();
+                return exists;
+            }
+            finally { m_rwLock.ExitWriteLock(); }
+        }
+
         public bool Remove(Tkey1 key)
         {
             m_rwLock.EnterWriteLock();

OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs

@@ -67,6 +67,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         private object m_setAppearanceLock = new object();
 
+        // add throttle
+        private ConcurrentDictionary<string, long> m_rebakeThrottle = new ConcurrentDictionary<string, long>();
+        private const int REBAKE_THROTTLE_SECONDS = 30;
+        
         #region Region Module interface
 
         public void Initialise(IConfigSource config)
@@ -451,10 +455,32 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
  
             sp.Appearance.WearableCacheItems = wearableCache;
 
+            // throttle rebake requests
+
             if (missing.Count > 0)
             {
+                long now = DateTime.UtcNow.Ticks;
+
                 foreach (UUID id in missing)
+                {
+                    string key = sp.UUID.ToString() + ":" + id.ToString();
+
+                    long last;
+                    if (m_rebakeThrottle.TryGetValue(key, out last))
+                    {
+                        TimeSpan age = new TimeSpan(now - last);
+                        if (age.TotalSeconds < REBAKE_THROTTLE_SECONDS)
+                            continue;
+                    }
+
+                    m_rebakeThrottle[key] = now;
+
+                    m_log.DebugFormat(
+                        "[AVFACTORY]: Missing baked texture {0} for {1}, requesting rebake",
+                        id, sp.Name);
+
                     sp.ControllingClient.SendRebakeAvatarTextures(id);
+                }
             }
 
             bool changed = false;