From 59b38f842af4a1ad81e24b132948481e75004d6d Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 21 Nov 2014 01:44:30 +0000 Subject: [PATCH] Add [Startup] JobEngineEnabled setting that allows the job engine to be disabled for testing purposes if necessary. --- OpenSim/Region/Application/OpenSimBase.cs | 4 +++- bin/OpenSimDefaults.ini | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 20401f1026..6a7291c6c9 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -337,7 +337,9 @@ namespace OpenSim { // Called from base.StartUp() - Watchdog.JobEngine.Start(); + IConfig startupConfig = Config.Configs["Startup"]; + if (startupConfig != null && startupConfig.GetBoolean("JobEngineEnabled", true)) + Watchdog.JobEngine.Start(); m_httpServerPort = m_networkServersInfo.HttpListenerPort; SceneManager.OnRestartSim += HandleRestartRegion; diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e89fa0aed5..3e9514ebbf 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -67,6 +67,10 @@ ; when running with the SmartThreadPool option above MaxPoolThreads = 300 + ; Allow certain jobs to be run consecutively in a job engine rather than always concurrently. + ; This improves performance in regions with large numbers of connections (in the hundreds). + JobEngineEnabled = true + ; Plugin Registry Location ; Set path to directory for plugin registry. Information about the ; registered repositories and installed plugins will be stored here.