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

Add in-code exaplanation for the change in cancellation signalling in STP 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306

user_profiles
Justin Clark-Casey (justincc) 2013-05-01 19:29:46 +01:00
parent 8d3250cee4
commit 81a90e30c6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -628,8 +628,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
}
}
Console.WriteLine("Here9");
lock (EventQueue)
{
workItem = m_CurrentWorkItem;

10
ThirdParty/SmartThreadPool/WorkItem.cs vendored
View File

@ -753,6 +753,16 @@ namespace Amib.Threading.Internal
}
else
{
// **************************
// Stock SmartThreadPool 2.2.3 sets these to true and relies on the thread to check the
// WorkItem cancellation status. However, OpenSimulator uses a different mechanism to notify
// scripts of co-operative termination and the abort code also relies on this method
// returning false in order to implement a small wait.
//
// Therefore, as was the case previously with STP, we will not signal successful cancellation
// here. It's possible that OpenSimulator code could be changed in the future to remove
// the need for this change.
// **************************
success = false;
signalComplete = false;
}