From 5a01ffa5150edf4c4f8b4675d8c8c2b2c6ec0684 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 16 Jul 2013 07:15:14 -0700
Subject: High CPU hunt: try a different blocking queue, DoubleQueue

---
 .../Framework/GridServiceThrottle/GridServiceThrottleModule.cs         | 3 ++-
 .../CoreModules/Framework/UserManagement/UserManagementModule.cs       | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
index fd4d48a..a069317 100644
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -49,7 +49,8 @@ namespace OpenSim.Region.CoreModules.Framework
 
         private readonly List<Scene> m_scenes = new List<Scene>();
 
-        private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
+        //private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
+        private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
 
         public void Initialise(IConfigSource config)
         {
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 507329e..ffb8bda 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -60,6 +60,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
         protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
 
         // Throttle the name requests
+        //private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
         private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
 
 
-- 
cgit v1.1