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

just DIE damm thread (recent monos issue)

httptests
UbitUmarov 2018-02-03 19:34:17 +00:00
parent 04a8ec518d
commit e7e8a7ab4d
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Region/ScriptEngine/XMREngine/XMREngine.cs
View File

@ -682,25 +682,33 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
* one to finish (ie, script gets to CheckRun() call). * one to finish (ie, script gets to CheckRun() call).
*/ */
m_Exiting = true; m_Exiting = true;
for (int i = 0; i < numThreadScriptWorkers; i ++) { for (int i = 0; i < numThreadScriptWorkers; i ++)
{
XMRScriptThread scriptThread = m_ScriptThreads[i]; XMRScriptThread scriptThread = m_ScriptThreads[i];
if (scriptThread != null) { if (scriptThread != null)
{
scriptThread.Terminate(); scriptThread.Terminate();
m_ScriptThreads[i] = null; m_ScriptThreads[i] = null;
} }
} }
if (m_SleepThread != null) {
lock (m_SleepQueue) { if (m_SleepThread != null)
{
lock (m_SleepQueue)
{
Monitor.PulseAll (m_SleepQueue); Monitor.PulseAll (m_SleepQueue);
} }
m_SleepThread.Join(); if(!m_SleepThread.Join(250))
m_SleepThread.Abort();
m_SleepThread = null; m_SleepThread = null;
} }
if (m_SliceThread != null) { /*
if (m_SliceThread != null)
{
m_SliceThread.Join(); m_SliceThread.Join();
m_SliceThread = null; m_SliceThread = null;
} }
*/
m_Scene.EventManager.OnFrame -= OnFrame; m_Scene.EventManager.OnFrame -= OnFrame;
m_Scene.EventManager.OnRezScript -= OnRezScript; m_Scene.EventManager.OnRezScript -= OnRezScript;
m_Scene.EventManager.OnRemoveScript -= OnRemoveScript; m_Scene.EventManager.OnRemoveScript -= OnRemoveScript;
@ -1759,29 +1767,30 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
/** /**
* @brief Thread that runs a time slicer. * @brief Thread that runs a time slicer.
*/ */
/*
private void RunSliceThread() private void RunSliceThread()
{ {
int ms = m_Config.GetInt ("TimeSlice", 50); int ms = m_Config.GetInt ("TimeSlice", 50);
while (!m_Exiting) { while (!m_Exiting) {
UpdateMyThread (); UpdateMyThread ();
*/
/* /*
* Let script run for a little bit. * Let script run for a little bit.
*/ */
System.Threading.Thread.Sleep (ms); // System.Threading.Thread.Sleep (ms);
/* /*
* If some script is running, flag it to suspend * If some script is running, flag it to suspend
* next time it calls CheckRun(). * next time it calls CheckRun().
*/ */
for (int i = 0; i < numThreadScriptWorkers; i ++) { /* for (int i = 0; i < numThreadScriptWorkers; i ++) {
XMRScriptThread st = m_ScriptThreads[i]; XMRScriptThread st = m_ScriptThreads[i];
if (st != null) st.TimeSlice(); if (st != null) st.TimeSlice();
} }
} }
MyThreadExiting (); MyThreadExiting ();
} }
*/
public void Suspend(UUID itemID, int ms) public void Suspend(UUID itemID, int ms)
{ {
XMRInstance instance = GetInstance (itemID); XMRInstance instance = GetInstance (itemID);
@ -1960,6 +1969,7 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
Thread thread = new Thread (start); Thread thread = new Thread (start);
thread.Name = name; thread.Name = name;
thread.Priority = priority; thread.Priority = priority;
thread.IsBackground = true;
thread.Start (); thread.Start ();
Watchdog.ThreadWatchdogInfo info = new Watchdog.ThreadWatchdogInfo (thread, Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS, name); Watchdog.ThreadWatchdogInfo info = new Watchdog.ThreadWatchdogInfo (thread, Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS, name);

3
OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs
View File

@ -105,7 +105,8 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
{ {
m_Exiting = true; m_Exiting = true;
WakeUpScriptThread(); WakeUpScriptThread();
thd.Join(); if(!thd.Join(250))
thd.Abort();
lock (m_AllThreads) lock (m_AllThreads)
m_AllThreads.Remove (thd); m_AllThreads.Remove (thd);