1 files changed, 24 insertions, 4 deletions

diff --git a/source/Target/ThreadCollection.cpp b/source/Target/ThreadCollection.cpp
index dc1e38e02420e..d8d622e9387ac 100644
--- a/source/Target/ThreadCollection.cpp
+++ b/source/Target/ThreadCollection.cpp
@@ -9,8 +9,10 @@
 #include <stdlib.h>
 
 #include <algorithm>
+#include <mutex>
 
 #include "lldb/Target/ThreadCollection.h"
+#include "lldb/Target/Thread.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -30,14 +32,32 @@ ThreadCollection::ThreadCollection(collection threads) :
 void
 ThreadCollection::AddThread (const ThreadSP &thread_sp)
 {
-    Mutex::Locker locker(GetMutex());
+    std::lock_guard<std::recursive_mutex> guard(GetMutex());
     m_threads.push_back (thread_sp);
 }
 
 void
+ThreadCollection::AddThreadSortedByIndexID (const ThreadSP &thread_sp)
+{
+    std::lock_guard<std::recursive_mutex> guard(GetMutex());
+    // Make sure we always keep the threads sorted by thread index ID
+    const uint32_t thread_index_id = thread_sp->GetIndexID();
+    if (m_threads.empty() || m_threads.back()->GetIndexID() < thread_index_id)
+        m_threads.push_back (thread_sp);
+    else
+    {
+        m_threads.insert(std::upper_bound(m_threads.begin(), m_threads.end(), thread_sp,
+                                          [] (const ThreadSP &lhs, const ThreadSP &rhs) -> bool
+                                          {
+                                              return lhs->GetIndexID() < rhs->GetIndexID();
+                                          }), thread_sp);
+    }
+}
+
+void
 ThreadCollection::InsertThread (const lldb::ThreadSP &thread_sp, uint32_t idx)
 {
-    Mutex::Locker locker(GetMutex());
+    std::lock_guard<std::recursive_mutex> guard(GetMutex());
     if (idx < m_threads.size())
         m_threads.insert(m_threads.begin() + idx, thread_sp);
     else
@@ -47,14 +67,14 @@ ThreadCollection::InsertThread (const lldb::ThreadSP &thread_sp, uint32_t idx)
 uint32_t
 ThreadCollection::GetSize ()
 {
-    Mutex::Locker locker(GetMutex());
+    std::lock_guard<std::recursive_mutex> guard(GetMutex());
     return m_threads.size();
 }
 
 ThreadSP
 ThreadCollection::GetThreadAtIndex (uint32_t idx)
 {
-    Mutex::Locker locker(GetMutex());
+    std::lock_guard<std::recursive_mutex> guard(GetMutex());
     ThreadSP thread_sp;
     if (idx < m_threads.size())
         thread_sp = m_threads[idx];