Sequence/throttle asset retrievals.

2 files changed, 69 insertions, 37 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 6121371..11852eb 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1471,6 +1471,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                     else
                         responseString = (string)responsedata["str_response_string"];
                     contentType = (string)responsedata["content_type"];
+                    if (responseString == null)
+                        responseString = String.Empty;
                 }
                 catch
                 {
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index daf38bc..9d6d9ad 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -27,6 +27,7 @@
 
 using log4net;
 using System;
+using System.Threading;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -50,7 +51,7 @@ namespace OpenSim.Services.Connectors
         private IImprovedAssetCache m_Cache = null;
         private int m_retryCounter;
         private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>();
-        private Timer m_retryTimer;
+        private System.Timers.Timer m_retryTimer;
         private delegate void AssetRetrievedEx(AssetBase asset);
 
         // Keeps track of concurrent requests for the same asset, so that it's only loaded once.
@@ -61,6 +62,8 @@ namespace OpenSim.Services.Connectors
 
         private Dictionary<string, string> m_UriMap = new Dictionary<string, string>();
 
+        private Thread[] m_fetchThreads;
+
         public AssetServicesConnector()
         {
         }
@@ -96,7 +99,7 @@ namespace OpenSim.Services.Connectors
             }
 
 
-            m_retryTimer = new Timer();
+            m_retryTimer = new System.Timers.Timer();
             m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck);
             m_retryTimer.Interval = 60000;
 
@@ -112,6 +115,14 @@ namespace OpenSim.Services.Connectors
                 m_UriMap[prefix] = groupHost;
                 //m_log.DebugFormat("[ASSET]: Using {0} for prefix {1}", groupHost, prefix);
             }
+
+            m_fetchThreads = new Thread[2];
+
+            for (int i = 0 ; i < 2 ; i++)
+            {
+                m_fetchThreads[i] = new Thread(AssetRequestProcessor);
+                m_fetchThreads[i].Start();
+            }
         }
 
         private string MapServer(string id)
@@ -261,37 +272,25 @@ namespace OpenSim.Services.Connectors
             return null;
         }
 
-        public bool Get(string id, Object sender, AssetRetrieved handler)
+        private class QueuedAssetRequest
         {
-            string uri = MapServer(id) + "/assets/" + id;
-
-            AssetBase asset = null;
-            if (m_Cache != null)
-                asset = m_Cache.Get(id);
+            public string uri;
+            public string id;
+        }
 
-            if (asset == null || asset.Data == null || asset.Data.Length == 0)
-            {
-                lock (m_AssetHandlers)
-                {
-                    AssetRetrievedEx handlerEx = new AssetRetrievedEx(delegate(AssetBase _asset) { handler(id, sender, _asset); });
+        private OpenMetaverse.BlockingQueue<QueuedAssetRequest> m_requestQueue =
+                new OpenMetaverse.BlockingQueue<QueuedAssetRequest>();
 
-//                    AssetRetrievedEx handlers;
-                    List<AssetRetrievedEx> handlers;
-                    if (m_AssetHandlers.TryGetValue(id, out handlers))
-                    {
-                        // Someone else is already loading this asset. It will notify our handler when done.
-//                        handlers += handlerEx;
-                        handlers.Add(handlerEx);
-                        return true;
-                    }
+        private void AssetRequestProcessor()
+        {
+            QueuedAssetRequest r;
 
-                    // Load the asset ourselves
-//                    handlers += handlerEx;
-                    handlers = new List<AssetRetrievedEx>();
-                    handlers.Add(handlerEx);
+            while (true)
+            {
+                r = m_requestQueue.Dequeue();
 
-                    m_AssetHandlers.Add(id, handlers);
-                }
+                string uri = r.uri;
+                string id = r.id;
 
                 bool success = false;
                 try
@@ -301,16 +300,7 @@ namespace OpenSim.Services.Connectors
                         {
                             if (m_Cache != null)
                                 m_Cache.Cache(a);
-/*
-                            AssetRetrievedEx handlers;
-                            lock (m_AssetHandlers)
-                            {
-                                handlers = m_AssetHandlers[id];
-                                m_AssetHandlers.Remove(id);
-                            }
 
-                            handlers.Invoke(a);
-*/
                             List<AssetRetrievedEx> handlers;
                             lock (m_AssetHandlers)
                             {
@@ -340,6 +330,46 @@ namespace OpenSim.Services.Connectors
                     }
                 }
             }
+        }
+
+        public bool Get(string id, Object sender, AssetRetrieved handler)
+        {
+            string uri = MapServer(id) + "/assets/" + id;
+
+            AssetBase asset = null;
+            if (m_Cache != null)
+                asset = m_Cache.Get(id);
+
+            if (asset == null || asset.Data == null || asset.Data.Length == 0)
+            {
+                lock (m_AssetHandlers)
+                {
+                    AssetRetrievedEx handlerEx = new AssetRetrievedEx(delegate(AssetBase _asset) { handler(id, sender, _asset); });
+
+//                    AssetRetrievedEx handlers;
+                    List<AssetRetrievedEx> handlers;
+                    if (m_AssetHandlers.TryGetValue(id, out handlers))
+                    {
+                        // Someone else is already loading this asset. It will notify our handler when done.
+//                        handlers += handlerEx;
+                        handlers.Add(handlerEx);
+                        return true;
+                    }
+
+                    // Load the asset ourselves
+//                    handlers += handlerEx;
+                    handlers = new List<AssetRetrievedEx>();
+                    handlers.Add(handlerEx);
+
+                    m_AssetHandlers.Add(id, handlers);
+                }
+
+                QueuedAssetRequest request = new QueuedAssetRequest();
+                request.id = id;
+                request.uri = uri;
+
+                m_requestQueue.Enqueue(request);
+            }
             else
             {
                 handler(id, sender, asset);