diff options
author | Tedd Hansen | 2008-02-22 14:09:38 +0000 |
---|---|---|
committer | Tedd Hansen | 2008-02-22 14:09:38 +0000 |
commit | a43bb10000ca0b58af2f33750ea17cb94bfbad7d (patch) | |
tree | 9f913c185d3ee90a3e88507bbd32e7c6bbab0c9d /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |
parent | Maintenance thread in charge of loading/unloading of scripts. 1 thread less p... (diff) | |
download | opensim-SC_OLD-a43bb10000ca0b58af2f33750ea17cb94bfbad7d.zip opensim-SC_OLD-a43bb10000ca0b58af2f33750ea17cb94bfbad7d.tar.gz opensim-SC_OLD-a43bb10000ca0b58af2f33750ea17cb94bfbad7d.tar.bz2 opensim-SC_OLD-a43bb10000ca0b58af2f33750ea17cb94bfbad7d.tar.xz |
Execution threads are now shared between regions too. Default thread count regardless of number of regions is now 3. This will save you around 33 threads for a normal 3x3 region server.
But, this is totally completely untested. So it probably won't work for another patch or five.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 5c9f76d..0911afb 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |||
@@ -156,12 +156,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
156 | m_ScriptEngine.m_EventQueueManager.AdjustNumberOfScriptThreads(); | 156 | m_ScriptEngine.m_EventQueueManager.AdjustNumberOfScriptThreads(); |
157 | 157 | ||
158 | // Check if any script has exceeded its max execution time | 158 | // Check if any script has exceeded its max execution time |
159 | if (m_ScriptEngine.m_EventQueueManager != null && | 159 | if (EventQueueManager.EnforceMaxExecutionTime) |
160 | m_ScriptEngine.m_EventQueueManager.EnforceMaxExecutionTime) | ||
161 | { | 160 | { |
162 | // We are enforcing execution time | 161 | // We are enforcing execution time |
163 | if (DateTime.Now.Ticks - Last_maxFunctionExecutionTimens > | 162 | if (DateTime.Now.Ticks - Last_maxFunctionExecutionTimens > |
164 | m_ScriptEngine.m_EventQueueManager.maxFunctionExecutionTimens) | 163 | EventQueueManager.maxFunctionExecutionTimens) |
165 | { | 164 | { |
166 | // Its time to check again | 165 | // Its time to check again |
167 | m_ScriptEngine.m_EventQueueManager.CheckScriptMaxExecTime(); // Do check | 166 | m_ScriptEngine.m_EventQueueManager.CheckScriptMaxExecTime(); // Do check |