Merge branch 'avination' into careminster

1 files changed, 172 insertions, 14 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 24a0190..d1ec4aa 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -58,6 +58,13 @@ namespace OpenSim.Region.ClientStack.Linden
             public Hashtable request;
         }
 
+        public class aPollResponse
+        {
+            public Hashtable response;
+            public int bytes;
+        }
+
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
@@ -72,6 +79,8 @@ namespace OpenSim.Region.ClientStack.Linden
         private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue =
                 new OpenMetaverse.BlockingQueue<aPollRequest>();
 
+        private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
+
         #region ISharedRegionModule Members
 
         public void Initialise(IConfigSource source)
@@ -88,6 +97,7 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
             m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
+            m_scene.EventManager.OnThrottleUpdate -= ThrottleUpdate;
             m_scene = null;
         }
 
@@ -98,6 +108,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
             m_scene.EventManager.OnDeregisterCaps += DeregisterCaps;
+            m_scene.EventManager.OnThrottleUpdate += ThrottleUpdate;
 
             if (m_workerThreads == null)
             {
@@ -115,6 +126,56 @@ namespace OpenSim.Region.ClientStack.Linden
                 }
             }
         }
+        private int ExtractImageThrottle(byte[] pthrottles)
+        {
+       
+            byte[] adjData;
+            int pos = 0;
+
+            if (!BitConverter.IsLittleEndian)
+            {
+                byte[] newData = new byte[7 * 4];
+                Buffer.BlockCopy(pthrottles, 0, newData, 0, 7 * 4);
+
+                for (int i = 0; i < 7; i++)
+                    Array.Reverse(newData, i * 4, 4);
+
+                adjData = newData;
+            }
+            else
+            {
+                adjData = pthrottles;
+            }
+
+            // 0.125f converts from bits to bytes
+            //int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+            //pos += 4;
+           // int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+            //pos += 4;
+           // int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+           // pos += 4;
+           // int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+           // pos += 4;
+           // int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+           // pos += 4;
+            pos = pos + 20;
+            int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); //pos += 4;
+            //int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
+            return texture;
+        }
+
+        // Now we know when the throttle is changed by the client in the case of a root agent or by a neighbor region in the case of a child agent.
+        public void ThrottleUpdate(ScenePresence p)
+        {
+            byte[] throttles = p.ControllingClient.GetThrottlesPacked(1);
+            UUID user = p.UUID;
+            int imagethrottle = ExtractImageThrottle(throttles);
+            PollServiceTextureEventArgs args;
+            if (m_pollservices.TryGetValue(user,out args))
+            {
+                args.UpdateThrottle(imagethrottle);
+            }
+        }
 
         public void PostInitialise()
         {
@@ -142,20 +203,25 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             private List<Hashtable> requests =
                     new List<Hashtable>();
-            private Dictionary<UUID, Hashtable> responses =
-                    new Dictionary<UUID, Hashtable>();
+            private Dictionary<UUID, aPollResponse> responses =
+                    new Dictionary<UUID, aPollResponse>();
 
             private Scene m_scene;
-
+            private CapsDataThrottler m_throttler = new CapsDataThrottler(100000, 1400000,10000);
             public PollServiceTextureEventArgs(UUID pId, Scene scene) :
                     base(null, null, null, null, pId, int.MaxValue)              
             {
                 m_scene = scene;
-
+                // x is request id, y is userid
                 HasEvents = (x, y) =>
                 {
                     lock (responses)
-                        return responses.ContainsKey(x);
+                    {
+                        bool ret = m_throttler.hasEvents(x, responses);
+                        m_throttler.ProcessTime();
+                        return ret;
+
+                    }
                 };
                 GetEvents = (x, y) =>
                 {
@@ -163,7 +229,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     {
                         try
                         {
-                            return responses[x];
+                            return responses[x].response;
                         }
                         finally
                         {
@@ -171,14 +237,14 @@ namespace OpenSim.Region.ClientStack.Linden
                         }
                     }
                 };
-
+                // x is request id, y is request data hashtable
                 Request = (x, y) =>
                 {
                     aPollRequest reqinfo = new aPollRequest();
                     reqinfo.thepoll = this;
                     reqinfo.reqID = x;
                     reqinfo.request = y;
-
+                    
                     m_queue.Enqueue(reqinfo);
                 };
 
@@ -220,16 +286,29 @@ namespace OpenSim.Region.ClientStack.Linden
                     response["content_type"] = "text/plain";
                     response["keepalive"] = false;
                     response["reusecontext"] = false;
-
+                    
                     lock (responses)
-                        responses[requestID] = response;
+                        responses[requestID] = new aPollResponse() {bytes = 0, response = response};
 
                     return;
                 }
-
+                
                 response = m_getTextureHandler.Handle(requestinfo.request);
                 lock (responses)
-                    responses[requestID] = response; 
+                {
+                    responses[requestID] = new aPollResponse()
+                                               {
+                                                   bytes = (int) response["int_bytes"],
+                                                   response = response
+                                               };
+                   
+                } 
+                m_throttler.ProcessTime();
+            }
+
+            internal void UpdateThrottle(int pimagethrottle)
+            {
+                m_throttler.ThrottleBytes = pimagethrottle;
             }
         }
 
@@ -254,19 +333,23 @@ namespace OpenSim.Region.ClientStack.Linden
                 protocol = "https";
             }
             caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
-
+            m_pollservices.Add(agentID, args);
             m_capsDict[agentID] = capUrl;
         }
 
         private void DeregisterCaps(UUID agentID, Caps caps)
         {
             string capUrl;
-
+            PollServiceTextureEventArgs args;
             if (m_capsDict.TryGetValue(agentID, out capUrl))
             {
                 MainServer.Instance.RemoveHTTPHandler("", capUrl);
                 m_capsDict.Remove(agentID);
             }
+            if (m_pollservices.TryGetValue(agentID, out args))
+            {
+                m_pollservices.Remove(agentID);
+            }
         }
 
         private void DoTextureRequests()
@@ -279,4 +362,79 @@ namespace OpenSim.Region.ClientStack.Linden
             }
         }
     }
+
+    internal sealed class CapsDataThrottler
+    {
+        
+        private volatile int currenttime = 0;
+        private volatile int lastTimeElapsed = 0;
+        private volatile int BytesSent = 0;
+        private int oversizedImages = 0;
+        public CapsDataThrottler(int pBytes, int max, int min)
+        {
+            ThrottleBytes = pBytes;
+            lastTimeElapsed = Util.EnvironmentTickCount();
+        }
+        public bool hasEvents(UUID key, Dictionary<UUID, GetTextureModule.aPollResponse> responses)
+        {
+            PassTime();
+            // Note, this is called IN LOCK
+            bool haskey = responses.ContainsKey(key);
+            if (!haskey)
+            {
+                return false;
+            }
+            GetTextureModule.aPollResponse response;
+            if (responses.TryGetValue(key,out response))
+            {
+
+                // Normal
+                if (BytesSent + response.bytes <= ThrottleBytes)
+                {
+                    BytesSent += response.bytes;
+                    //TimeBasedAction timeBasedAction = new TimeBasedAction { byteRemoval = response.bytes, requestId = key, timeMS = currenttime + 1000, unlockyn = false };
+                    //m_actions.Add(timeBasedAction);
+                    return true;
+                }
+                    // Big textures
+                else if (response.bytes > ThrottleBytes && oversizedImages <= ((ThrottleBytes%50000) + 1))
+                {
+                    Interlocked.Increment(ref oversizedImages);
+                    BytesSent += response.bytes;
+                    //TimeBasedAction timeBasedAction = new TimeBasedAction { byteRemoval = response.bytes, requestId = key, timeMS = currenttime + (((response.bytes % ThrottleBytes)+1)*1000) , unlockyn = false };
+                    //m_actions.Add(timeBasedAction);
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+            return haskey;
+        }
+        public void ProcessTime()
+        {
+            PassTime();
+        }
+       
+        
+        private void PassTime()
+        {
+            currenttime = Util.EnvironmentTickCount();
+            int timeElapsed = Util.EnvironmentTickCountSubtract(currenttime, lastTimeElapsed);
+            //processTimeBasedActions(responses);
+            if (Util.EnvironmentTickCountSubtract(currenttime, timeElapsed) >= 1000)
+            {
+                lastTimeElapsed = Util.EnvironmentTickCount();
+                BytesSent -= ThrottleBytes;
+                if (BytesSent < 0) BytesSent = 0;
+                if (BytesSent < ThrottleBytes)
+                {
+                    oversizedImages = 0;
+                }
+            }
+        }
+        public int ThrottleBytes;
+    }
 }