1 files changed, 47 insertions, 2 deletions

diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 4b9a509..814758a 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Reflection;
 using System.Xml;
+using System.Diagnostics;
 using System.Xml.Schema;
 using System.Xml.Serialization;
 using log4net;
@@ -51,6 +52,11 @@ namespace OpenSim.Framework
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         private Thread LockedByThread;
+        private string WriterStack;
+
+        private Dictionary<Thread, string> ReadLockers =
+                new Dictionary<Thread, string>();
+
         /// <value>
         /// An advanced lock for inventory data
         /// </value>
@@ -90,6 +96,19 @@ namespace OpenSim.Framework
                 if (m_itemLock.RecursiveReadCount > 0)
                 {
                     m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
+                    try
+                    {
+                        StackTrace stackTrace = new StackTrace();           // get call stack
+                        StackFrame[] stackFrames = stackTrace.GetFrames();  // get method calls (frames)
+
+                        // write call stack method names
+                        foreach (StackFrame stackFrame in stackFrames)
+                        {
+                            m_log.Error("[SceneObjectGroup.m_parts]  "+(stackFrame.GetMethod().Name));   // write method name
+                        }
+                    }
+                    catch
+                    {}
                     m_itemLock.ExitReadLock();
                 }
                 if (m_itemLock.RecursiveWriteCount > 0)
@@ -104,6 +123,13 @@ namespace OpenSim.Framework
                     if (m_itemLock.IsWriteLockHeld)
                     {
                         m_itemLock = new System.Threading.ReaderWriterLockSlim();
+                        System.Console.WriteLine("------------------------------------------");
+                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
+                        System.Console.WriteLine("------------------------------------------");
+                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
+                        System.Console.WriteLine("------------------------------------------");
+                        LockedByThread = null;
+                        ReadLockers.Clear();
                     }
                 }
             }
@@ -136,14 +162,33 @@ namespace OpenSim.Framework
                 }
                 while (!m_itemLock.TryEnterWriteLock(60000))
                 {
-                    m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
                     if (m_itemLock.IsWriteLockHeld)
                     {
-                        m_itemLock = new System.Threading.ReaderWriterLockSlim();
+                        m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
+                        System.Console.WriteLine("------------------------------------------");
+                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
+                        System.Console.WriteLine("------------------------------------------");
+                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
+                        System.Console.WriteLine("------------------------------------------");
+                    }
+                    else
+                    {
+                        m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by a reader. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
+                        System.Console.WriteLine("------------------------------------------");
+                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
+                        System.Console.WriteLine("------------------------------------------");
+                        foreach (KeyValuePair<Thread, string> kvp in ReadLockers)
+                        {
+                            System.Console.WriteLine("Locker name {0} call stack:\n" + kvp.Value, kvp.Key.Name);
+                            System.Console.WriteLine("------------------------------------------");
+                        }
                     }
+                    m_itemLock = new System.Threading.ReaderWriterLockSlim();
+                    ReadLockers.Clear();
                 }
 
                 LockedByThread = Thread.CurrentThread;
+                WriterStack = Environment.StackTrace;
             }
             else
             {