aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-16 07:15:14 -0700
committerDiva Canto2013-07-16 07:15:14 -0700
commit5a01ffa5150edf4c4f8b4675d8c8c2b2c6ec0684 (patch)
treef68e0b37784cbe2af30d04119ed373d5d4904fa2
parentrevert last commit which seems to conflict with DoubleQueue internals. The ra... (diff)
downloadopensim-SC_OLD-5a01ffa5150edf4c4f8b4675d8c8c2b2c6ec0684.zip
opensim-SC_OLD-5a01ffa5150edf4c4f8b4675d8c8c2b2c6ec0684.tar.gz
opensim-SC_OLD-5a01ffa5150edf4c4f8b4675d8c8c2b2c6ec0684.tar.bz2
opensim-SC_OLD-5a01ffa5150edf4c4f8b4675d8c8c2b2c6ec0684.tar.xz
High CPU hunt: try a different blocking queue, DoubleQueue
-rw-r--r--OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs3
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs1
2 files changed, 3 insertions, 1 deletions
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
49 49
50 private readonly List<Scene> m_scenes = new List<Scene>(); 50 private readonly List<Scene> m_scenes = new List<Scene>();
51 51
52 private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>(); 52 //private OpenSim.Framework.BlockingQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<GridRegionRequest>();
53 private OpenSim.Framework.DoubleQueue<GridRegionRequest> m_RequestQueue = new OpenSim.Framework.DoubleQueue<GridRegionRequest>();
53 54
54 public void Initialise(IConfigSource config) 55 public void Initialise(IConfigSource config)
55 { 56 {
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
60 protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>(); 60 protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
61 61
62 // Throttle the name requests 62 // Throttle the name requests
63 //private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
63 private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>(); 64 private OpenSim.Framework.BlockingQueue<NameRequest> m_RequestQueue = new OpenSim.Framework.BlockingQueue<NameRequest>();
64 65
65 66