diff options
author | UbitUmarov | 2017-05-23 04:05:31 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-23 04:05:31 +0100 |
commit | f3eb73926e1602f855f2c7fceb040b07f7265f3b (patch) | |
tree | b873442fcad6dfc6b82f347445ddd6adfac53787 /OpenSim | |
parent | please DIE! PLEASE?? (diff) | |
download | opensim-SC_OLD-f3eb73926e1602f855f2c7fceb040b07f7265f3b.zip opensim-SC_OLD-f3eb73926e1602f855f2c7fceb040b07f7265f3b.tar.gz opensim-SC_OLD-f3eb73926e1602f855f2c7fceb040b07f7265f3b.tar.bz2 opensim-SC_OLD-f3eb73926e1602f855f2c7fceb040b07f7265f3b.tar.xz |
stop a few more threads on exit
Diffstat (limited to 'OpenSim')
3 files changed, 21 insertions, 17 deletions
diff --git a/OpenSim/Framework/Monitoring/WorkManager.cs b/OpenSim/Framework/Monitoring/WorkManager.cs index 43130f9..a3e0390 100644 --- a/OpenSim/Framework/Monitoring/WorkManager.cs +++ b/OpenSim/Framework/Monitoring/WorkManager.cs | |||
@@ -82,6 +82,11 @@ namespace OpenSim.Framework.Monitoring | |||
82 | HandleControlCommand); | 82 | HandleControlCommand); |
83 | } | 83 | } |
84 | 84 | ||
85 | public static void Stop() | ||
86 | { | ||
87 | JobEngine.Stop(); | ||
88 | } | ||
89 | |||
85 | /// <summary> | 90 | /// <summary> |
86 | /// Start a new long-lived thread. | 91 | /// Start a new long-lived thread. |
87 | /// </summary> | 92 | /// </summary> |
@@ -131,7 +136,6 @@ namespace OpenSim.Framework.Monitoring | |||
131 | 136 | ||
132 | thread.Start(); | 137 | thread.Start(); |
133 | 138 | ||
134 | |||
135 | return thread; | 139 | return thread; |
136 | } | 140 | } |
137 | 141 | ||
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 99d94bb..7d21e00 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -116,6 +116,8 @@ namespace OpenSim.Framework.Servers | |||
116 | 116 | ||
117 | Thread.Sleep(5000); | 117 | Thread.Sleep(5000); |
118 | 118 | ||
119 | WorkManager.Stop(); | ||
120 | |||
119 | RemovePIDFile(); | 121 | RemovePIDFile(); |
120 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); | 122 | m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); |
121 | 123 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 6a39bb9..2a31efd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
@@ -197,20 +197,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
197 | ~AsyncCommandManager() | 197 | ~AsyncCommandManager() |
198 | { | 198 | { |
199 | // Shut down thread | 199 | // Shut down thread |
200 | // try | 200 | try |
201 | // { | 201 | { |
202 | // if (cmdHandlerThread != null) | 202 | if (cmdHandlerThread != null) |
203 | // { | 203 | { |
204 | // if (cmdHandlerThread.IsAlive == true) | 204 | if (cmdHandlerThread.IsAlive == true) |
205 | // { | 205 | { |
206 | // cmdHandlerThread.Abort(); | 206 | cmdHandlerThread.Abort(); |
207 | // //cmdHandlerThread.Join(); | 207 | //cmdHandlerThread.Join(); |
208 | // } | 208 | } |
209 | // } | 209 | } |
210 | // } | 210 | } |
211 | // catch | 211 | catch |
212 | // { | 212 | { |
213 | // } | 213 | } |
214 | } | 214 | } |
215 | 215 | ||
216 | /// <summary> | 216 | /// <summary> |
@@ -387,8 +387,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
387 | } | 387 | } |
388 | } | 388 | } |
389 | 389 | ||
390 | |||
391 | |||
392 | public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) | 390 | public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) |
393 | { | 391 | { |
394 | List<Object> data = new List<Object>(); | 392 | List<Object> data = new List<Object>(); |