diff options
| author | Justin Clark-Casey (justincc) | 2012-12-12 23:30:26 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-12-12 23:30:26 +0000 |
| commit | 512e4c931379877a1fd8c35f41111431f0a85ff5 (patch) | |
| tree | dafc0c5387310728fe0f048495912daf750f1c20 /OpenSim/Region | |
| parent | Add "debug script log" command to allow setting a numeric debug level on indi... (diff) | |
| download | opensim-SC_OLD-512e4c931379877a1fd8c35f41111431f0a85ff5.zip opensim-SC_OLD-512e4c931379877a1fd8c35f41111431f0a85ff5.tar.gz opensim-SC_OLD-512e4c931379877a1fd8c35f41111431f0a85ff5.tar.bz2 opensim-SC_OLD-512e4c931379877a1fd8c35f41111431f0a85ff5.tar.xz | |
Log situations where workitem event threads are aborted on stop request because they failed to complete event processing within the given timeout.
This is for bug hunting purposes where thread aborts may be causing dangling lock issues and subsequent vm crashes on mono (with ReaderWriterLockSlim, etc.)
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 435e9dc..dfe8386 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -550,9 +550,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 550 | // forcibly abort the work item (this aborts the underlying thread). | 550 | // forcibly abort the work item (this aborts the underlying thread). |
| 551 | if (!m_InSelfDelete) | 551 | if (!m_InSelfDelete) |
| 552 | { | 552 | { |
| 553 | // m_log.ErrorFormat( | 553 | m_log.DebugFormat( |
| 554 | // "[SCRIPT INSTANCE]: Aborting script {0} {1} in prim {2} {3} {4} {5}", | 554 | "[SCRIPT INSTANCE]: Aborting unstopped script {0} {1} in prim {2}, localID {3}, timeout was {4} ms", |
| 555 | // ScriptName, ItemID, PrimName, ObjectID, m_InSelfDelete, DateTime.Now.Ticks); | 555 | ScriptName, ItemID, PrimName, LocalID, timeout); |
| 556 | 556 | ||
| 557 | workItem.Abort(); | 557 | workItem.Abort(); |
| 558 | } | 558 | } |