aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
diff options
context:
space:
mode:
authorTedd Hansen2008-02-01 22:18:55 +0000
committerTedd Hansen2008-02-01 22:18:55 +0000
commita6726b0c9de4ef875348f9dcbf21a9c93bde8a09 (patch)
treebcf0fbbe7306172e2933f59799813f84ed5a621f /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
parentThank you, Kinoc for the ChatModule.cs updates. (diff)
downloadopensim-SC_OLD-a6726b0c9de4ef875348f9dcbf21a9c93bde8a09.zip
opensim-SC_OLD-a6726b0c9de4ef875348f9dcbf21a9c93bde8a09.tar.gz
opensim-SC_OLD-a6726b0c9de4ef875348f9dcbf21a9c93bde8a09.tar.bz2
opensim-SC_OLD-a6726b0c9de4ef875348f9dcbf21a9c93bde8a09.tar.xz
SCRIPT SUPPORT IS STILL BROKEN.
Bugfix: Scripts exceeding max and set to be killed were not killed, only removed. Added ability to re-read configuration while OpenSim is running All regions now sharing one MaintenanceThread New MaintenanceThread: - checks for script execution timeout - re-reads config - starts/stops threads if thread active count becomes too high/low compared to config Speed increase on event execution: - Reuse of try{}catch{} blocks - Time calculation on event execution
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs12
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
index fa40947..cfcc36e 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
@@ -55,6 +55,15 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
55 public IConfig ScriptConfigSource; 55 public IConfig ScriptConfigSource;
56 public abstract string ScriptConfigSourceName { get; } 56 public abstract string ScriptConfigSourceName { get; }
57 57
58 /// <summary>
59 /// How many seconds between re-reading config-file. 0 = never. ScriptEngine will try to adjust to new config changes.
60 /// </summary>
61 public int ReReadConfigFileSeconds {
62 get { return (int)(ReReadConfigFilens / 10000); }
63 set { ReReadConfigFilens = value * 10000; }
64 }
65 public long ReReadConfigFilens = 0;
66
58 public ScriptManager GetScriptManager() 67 public ScriptManager GetScriptManager()
59 { 68 {
60 return _GetScriptManager(); 69 return _GetScriptManager();
@@ -93,6 +102,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
93 m_AppDomainManager = new AppDomainManager(ScriptConfigSource.GetInt("ScriptsPerAppDomain", 1)); 102 m_AppDomainManager = new AppDomainManager(ScriptConfigSource.GetInt("ScriptsPerAppDomain", 1));
94 m_LSLLongCmdHandler = new LSLLongCmdHandler(this); 103 m_LSLLongCmdHandler = new LSLLongCmdHandler(this);
95 104
105 ReReadConfigFileSeconds = ScriptConfigSource.GetInt("ReReadConfig", 0);
106
107
96 // Should we iterate the region for scripts that needs starting? 108 // Should we iterate the region for scripts that needs starting?
97 // Or can we assume we are loaded before anything else so we can use proper events? 109 // Or can we assume we are loaded before anything else so we can use proper events?
98 } 110 }