OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stop a few more threads on exit

0.9.0-post-fixes
UbitUmarov 2017-05-23 04:05:31 +01:00
parent 928733efc9
commit f3eb73926e
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Monitoring/WorkManager.cs
View File

@ -82,6 +82,11 @@ namespace OpenSim.Framework.Monitoring
HandleControlCommand); HandleControlCommand);
} }
public static void Stop()
{
JobEngine.Stop();
}
/// <summary> /// <summary>
/// Start a new long-lived thread. /// Start a new long-lived thread.
/// </summary> /// </summary>
@ -131,7 +136,6 @@ namespace OpenSim.Framework.Monitoring
thread.Start(); thread.Start();
return thread; return thread;
} }

2
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -116,6 +116,8 @@ namespace OpenSim.Framework.Servers
Thread.Sleep(5000); Thread.Sleep(5000);
WorkManager.Stop();
RemovePIDFile(); RemovePIDFile();
m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting...");

30
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
View File

@ -197,20 +197,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
~AsyncCommandManager() ~AsyncCommandManager()
{ {
// Shut down thread // Shut down thread
// try try
// { {
// if (cmdHandlerThread != null) if (cmdHandlerThread != null)
// { {
// if (cmdHandlerThread.IsAlive == true) if (cmdHandlerThread.IsAlive == true)
// { {
// cmdHandlerThread.Abort(); cmdHandlerThread.Abort();
// //cmdHandlerThread.Join(); //cmdHandlerThread.Join();
// } }
// } }
// } }
// catch catch
// { {
// } }
} }
/// <summary> /// <summary>
@ -387,8 +387,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
{ {
List<Object> data = new List<Object>(); List<Object> data = new List<Object>();