3 files changed, 86 insertions, 66 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 0f90d37..c3e7ec2 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -102,17 +102,50 @@ namespace OpenSim
             m_log.InfoFormat(
                 "[OPENSIM MAIN]: Environment variable MONO_THREADS_PER_CPU is {0}", monoThreadsPerCpu ?? "unset");
 
-            // Increase the number of IOCP threads available. Mono defaults to a tragically low number
+            // Verify the Threadpool allocates or uses enough worker and IO completion threads
+                        // .NET 2.0 workerthreads default to 50 *  numcores
+                        // .NET 3.0 workerthreads defaults to 250 * numcores
+                        // .NET 4.0 workerthreads are dynamic based on bitness and OS resources
+                        // Max IO Completion threads are 1000 on all 3 CLRs.
+                        int workerThreadsMin = 500;
+                        int workerThreadsMax = 1000; // may need further adjustment to match other CLR
+                        int iocpThreadsMin = 1000;
+                        int iocpThreadsMax = 2000; // may need further adjustment to match other CLR
             int workerThreads, iocpThreads;
             System.Threading.ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads);
             m_log.InfoFormat("[OPENSIM MAIN]: Runtime gave us {0} worker threads and {1} IOCP threads", workerThreads, iocpThreads);
-            if (workerThreads < 500 || iocpThreads < 1000)
+            if (workerThreads < workerThreadsMin)
             {
-                workerThreads = 500;
-                iocpThreads = 1000;
-                m_log.Info("[OPENSIM MAIN]: Bumping up to 500 worker threads and 1000 IOCP threads");
-                System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads);
+                workerThreads = workerThreadsMin;
+                m_log.InfoFormat("[OPENSIM MAIN]: Bumping up to worker threads to {0}",workerThreads);
             }
+            if (workerThreads > workerThreadsMax)
+            {
+                workerThreads = workerThreadsMax;
+                m_log.InfoFormat("[OPENSIM MAIN]: Limiting worker threads to {0}",workerThreads);
+            }
+                        // Increase the number of IOCP threads available.
+                        // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17)
+                        if (iocpThreads < iocpThreadsMin)
+            {
+                iocpThreads = iocpThreadsMin;
+                m_log.InfoFormat("[OPENSIM MAIN]: Bumping up IO completion threads to {0}",iocpThreads);
+            }
+                        // Make sure we don't overallocate IOCP threads and thrash system resources
+            if ( iocpThreads > iocpThreadsMax )
+            {
+                iocpThreads = iocpThreadsMax;
+                m_log.InfoFormat("[OPENSIM MAIN]: Limiting IO completion threads to {0}",iocpThreads);
+            }
+                        // set the resulting worker and IO completion thread counts back to ThreadPool
+            if ( System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads) )
+                        {
+                    m_log.InfoFormat("[OPENSIM MAIN]: Threadpool set to {0} worker threads and {1} IO completion threads", workerThreads, iocpThreads);
+                        }
+                        else
+                        {
+                    m_log.Info("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect.");                         
+                        }
 
             // Check if the system is compatible with OpenSimulator.
             // Ensures that the minimum system requirements are met
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 08e4023..a5b9443 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -30,6 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -236,18 +237,6 @@ namespace OpenSim
                                           + "If an avatar name is given then only packets from that avatar are logged",
                                           Debug);
 
-            m_console.Commands.AddCommand("Debug", false, "debug teleport", "debug teleport", "Toggle teleport route debugging", Debug);
-
-            m_console.Commands.AddCommand("Debug", false, "debug scene",
-                                          "debug scene active|collisions|physics|scripting|teleport true|false",
-                                          "Turn on scene debugging.",
-                                            "If active     is false then main scene update and maintenance loops are suspended.\n"
-                                          + "If collisions is false then collisions with other objects are turned off.\n"
-                                          + "If physics    is false then all physics objects are non-physical.\n"
-                                          + "If scripting  is false then no scripting operations happen.\n"
-                                          + "If teleport   is true  then some extra teleport debug information is logged.",
-                                          Debug);
-
             m_console.Commands.AddCommand("General", false, "change region",
                                           "change region <region name>",
                                           "Change current console region", ChangeSelectedRegion);
@@ -744,31 +733,6 @@ namespace OpenSim
 
                     break;
 
-                case "scene":
-                    if (args.Length == 4)
-                    {
-                        if (SceneManager.CurrentScene == null)
-                        {
-                            MainConsole.Instance.Output("Please use 'change region <regioname>' first");
-                        }
-                        else
-                        {
-                            string key = args[2];
-                            string value = args[3];
-                            SceneManager.CurrentScene.SetSceneCoreDebug(
-                                new Dictionary<string, string>() { { key, value } });
-
-                            MainConsole.Instance.OutputFormat("Set debug scene {0} = {1}", key, value);
-                        }
-                    }
-                    else
-                    {
-                        MainConsole.Instance.Output(
-                            "Usage: debug scene active|scripting|collisions|physics|teleport true|false");
-                    }
-
-                    break;
-
                 default:
                     MainConsole.Instance.Output("Unknown debug command");
                     break;
@@ -845,16 +809,28 @@ namespace OpenSim
                     break;
 
                 case "modules":
-                    SceneManager.ForEachScene(
-                        delegate(Scene scene) {
-                        MainConsole.Instance.Output("Loaded region modules in" + scene.RegionInfo.RegionName + " are:");
-                        foreach (IRegionModuleBase module in scene.RegionModules.Values)
+                    SceneManager.ForEachSelectedScene(
+                        scene => 
                         {
-                            Type type = module.GetType().GetInterface("ISharedRegionModule");
-                            string module_type = type != null ? "Shared" : "Non-Shared";
-                            MainConsole.Instance.OutputFormat("New Region Module ({0}): {1}", module_type, module.Name);
+                            MainConsole.Instance.OutputFormat("Loaded region modules in {0} are:", scene.Name);
+
+                            List<IRegionModuleBase> sharedModules = new List<IRegionModuleBase>();
+                            List<IRegionModuleBase> nonSharedModules = new List<IRegionModuleBase>();
+
+                            foreach (IRegionModuleBase module in scene.RegionModules.Values)
+                            {
+                                if (module.GetType().GetInterface("ISharedRegionModule") != null)
+                                    nonSharedModules.Add(module);
+                                else
+                                    sharedModules.Add(module);
+                            }
+
+                            foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
+                                MainConsole.Instance.OutputFormat("New Region Module (Shared): {0}", module.Name);
+
+                            foreach (IRegionModuleBase module in sharedModules.OrderBy(m => m.Name))
+                                MainConsole.Instance.OutputFormat("New Region Module (Non-Shared): {0}", module.Name);
                         }
-                    }
                     );
 
                     MainConsole.Instance.Output("");
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index bed9a49..7497d88 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -138,6 +138,10 @@ namespace OpenSim
         /// <param name="configSource"></param>
         public OpenSimBase(IConfigSource configSource) : base()
         {
+            // FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
+            // XmlConfigurator calls first accross servers.
+            m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
+
             LoadConfigSettings(configSource);
         }
 
@@ -331,7 +335,7 @@ namespace OpenSim
         /// <param name="regionInfo"></param>
         /// <param name="portadd_flag"></param>
         /// <returns></returns>
-        public IClientNetworkServer CreateRegion(RegionInfo regionInfo, bool portadd_flag, out IScene scene)
+        public List<IClientNetworkServer> CreateRegion(RegionInfo regionInfo, bool portadd_flag, out IScene scene)
         {
             return CreateRegion(regionInfo, portadd_flag, false, out scene);
         }
@@ -341,7 +345,7 @@ namespace OpenSim
         /// </summary>
         /// <param name="regionInfo"></param>
         /// <returns></returns>
-        public IClientNetworkServer CreateRegion(RegionInfo regionInfo, out IScene scene)
+        public List<IClientNetworkServer> CreateRegion(RegionInfo regionInfo, out IScene scene)
         {
             return CreateRegion(regionInfo, false, true, out scene);
         }
@@ -353,7 +357,7 @@ namespace OpenSim
         /// <param name="portadd_flag"></param>
         /// <param name="do_post_init"></param>
         /// <returns></returns>
-        public IClientNetworkServer CreateRegion(RegionInfo regionInfo, bool portadd_flag, bool do_post_init, out IScene mscene)
+        public List<IClientNetworkServer> CreateRegion(RegionInfo regionInfo, bool portadd_flag, bool do_post_init, out IScene mscene)
         {
             int port = regionInfo.InternalEndPoint.Port;
 
@@ -378,8 +382,8 @@ namespace OpenSim
                 Util.XmlRpcCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName);
             }
 
-            IClientNetworkServer clientServer;
-            Scene scene = SetupScene(regionInfo, proxyOffset, Config, out clientServer);
+            List<IClientNetworkServer> clientServers;
+            Scene scene = SetupScene(regionInfo, proxyOffset, Config, out clientServers);
 
             m_log.Info("[MODULES]: Loading Region's modules (old style)");
 
@@ -483,8 +487,11 @@ namespace OpenSim
 
             if (m_autoCreateClientStack)
             {
-                m_clientServers.Add(clientServer);
-                clientServer.Start();
+                foreach (IClientNetworkServer clientserver in clientServers)
+                {
+                    m_clientServers.Add(clientserver);
+                    clientserver.Start();
+                }
             }
 
             if (scene.SnmpService != null)
@@ -504,7 +511,7 @@ namespace OpenSim
             scene.Start();
             scene.StartScripts();
 
-            return clientServer;
+            return clientServers;
         }
 
         /// <summary>
@@ -725,7 +732,7 @@ namespace OpenSim
         /// <param name="regionInfo"></param>
         /// <param name="clientServer"> </param>
         /// <returns></returns>
-        protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer)
+        protected Scene SetupScene(RegionInfo regionInfo, out List<IClientNetworkServer> clientServer)
         {
             return SetupScene(regionInfo, 0, null, out clientServer);
         }
@@ -739,8 +746,10 @@ namespace OpenSim
         /// <param name="clientServer"> </param>
         /// <returns></returns>
         protected Scene SetupScene(
-            RegionInfo regionInfo, int proxyOffset, IConfigSource configSource, out IClientNetworkServer clientServer)
+            RegionInfo regionInfo, int proxyOffset, IConfigSource configSource, out List<IClientNetworkServer> clientServer)
         {
+            List<IClientNetworkServer> clientNetworkServers = null;
+
             AgentCircuitManager circuitManager = new AgentCircuitManager();
             IPAddress listenIP = regionInfo.InternalEndPoint.Address;
             //if (!IPAddress.TryParse(regionInfo.InternalEndPoint, out listenIP))
@@ -750,8 +759,7 @@ namespace OpenSim
 
             if (m_autoCreateClientStack)
             {
-                clientServer
-                    = m_clientStackManager.CreateServer(
+                clientNetworkServers = m_clientStackManager.CreateServers(
                         listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, configSource,
                         circuitManager);
             }
@@ -766,9 +774,12 @@ namespace OpenSim
 
             if (m_autoCreateClientStack)
             {
-                clientServer.AddScene(scene);
+                foreach (IClientNetworkServer clientnetserver in clientNetworkServers)
+                {
+                    clientnetserver.AddScene(scene);
+                }
             }
-
+            clientServer = clientNetworkServers;
             scene.LoadWorldMap();
 
             scene.PhysicsScene = GetPhysicsScene(scene.RegionInfo.RegionName);
@@ -791,7 +802,7 @@ namespace OpenSim
 
             return new Scene(
                 regionInfo, circuitManager, sceneGridService,
-                simDataService, estateDataService, false,
+                simDataService, estateDataService,
                 Config, m_version);
         }