Merge branch 'master' into httptests

2 files changed, 3 insertions, 35 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index a1bc27b..7c7d08d 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public enum EventType : int
         {
-            LongPoll = 0,
+            Poll = 0,
             LslHttp = 1,
             Inventory = 2,
             Texture = 3,
@@ -85,7 +85,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             Drop = pDrop;
             Id = pId;
             TimeOutms = pTimeOutms;
-            Type = EventType.LongPoll;
+            Type = EventType.Poll;
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 82c7727..4dad44a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -48,7 +48,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         private Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>> m_bycontext;
         private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
-        private static Queue<PollServiceHttpRequest> m_slowRequests = new Queue<PollServiceHttpRequest>();
         private static Queue<PollServiceHttpRequest> m_retryRequests = new Queue<PollServiceHttpRequest>();
 
         private uint m_WorkerThreadCount = 0;
@@ -56,11 +55,9 @@ namespace OpenSim.Framework.Servers.HttpServer
         private Thread m_retrysThread;
 
         private bool m_running = false;
-        private int slowCount = 0;
 
         private SmartThreadPool m_threadPool;
 
-
         public PollServiceRequestManager(
             BaseHttpServer pSrv, bool performResponsesAsync, uint pWorkerThreadCount, int pTimeout)
         {
@@ -80,7 +77,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             startInfo.ThreadPoolName = "PoolService";
 
             m_threadPool = new SmartThreadPool(startInfo);
-
         }
 
         public void Start()
@@ -176,17 +172,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         public void EnqueueInt(PollServiceHttpRequest req)
         {
             if (m_running)
-            {
-                if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.LongPoll)
-                {
-                    m_requests.Enqueue(req);
-                }
-                else
-                {
-                    lock (m_slowRequests)
-                        m_slowRequests.Enqueue(req);
-                }
-            }
+                m_requests.Enqueue(req);
         }
 
         private void CheckRetries()
@@ -201,17 +187,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                     while (m_retryRequests.Count > 0 && m_running)
                         m_requests.Enqueue(m_retryRequests.Dequeue());
                 }
-                slowCount++;
-                if (slowCount >= 10)
-                {
-                    slowCount = 0;
-
-                    lock (m_slowRequests)
-                    {
-                        while (m_slowRequests.Count > 0 && m_running)
-                            m_requests.Enqueue(m_slowRequests.Dequeue());
-                    }
-                }
             }
         }
 
@@ -244,13 +219,6 @@ namespace OpenSim.Framework.Servers.HttpServer
             PollServiceHttpRequest wreq;
             m_retryRequests.Clear();
 
-            lock (m_slowRequests)
-            {
-                while (m_slowRequests.Count > 0)
-                    m_requests.Enqueue(m_slowRequests.Dequeue());
-
-            }
-
             while (m_requests.Count() > 0)
             {
                 try