Merge branch 'feature/MSP-11147/thread-leak-detection' into feature/MSP-11605/lazy-thread-creation

MSP-11605

Author: limhoff-r7

lib/metasploit/framework/spec/threads/suite.rb

@@ -69,11 +69,6 @@ def self.configure!
                   end
 
                   thread_list = Metasploit::Framework::Spec::Threads::Suite.non_debugger_thread_list
-
-                  thread_uuids = thread_list.map { |thread|
-                    thread[Metasploit::Framework::Spec::Threads::Suite::UUID_THREAD_LOCAL_VARIABLE]
-                  }.compact
-
                   thread_count = thread_list.count
 
                   if thread_count > EXPECTED_THREAD_COUNT_AROUND_SUITE
@@ -82,10 +77,18 @@ def self.configure!
                     if LOG_PATHNAME.exist?
                       caller_by_thread_uuid = Metasploit::Framework::Spec::Threads::Suite.caller_by_thread_uuid
 
-                      thread_uuids.each do |thread_uuid|
+                      thread_list.each do |thread|
+                        thread_uuid = thread[Metasploit::Framework::Spec::Threads::Suite::UUID_THREAD_LOCAL_VARIABLE]
+
+                        # unmanaged thread, such as the main VM thread
+                        unless thread_uuid
+                          next
+                        end
+
                         caller = caller_by_thread_uuid[thread_uuid]
 
-                        error_lines << "Thread #{thread_uuid}\n"
+                        error_lines << "Thread #{thread_uuid}'s status is #{thread.status.inspect} " \
+                                       "and was started here:\n"
 
                         error_lines.concat(caller)
                       end