Merge branch 'master' into filtering-sooner

Author: MetanoKid

src/BuildAnalyzer/Analyzers/BuildTimeline/BuildTimelineAnalyzer.cpp

@@ -29,7 +29,8 @@ CppBI::AnalysisControl BuildTimelineAnalyzer::OnStartActivity(const CppBI::Event
         CppBI::MatchEventInMemberFunction(eventStack.Back(), this, &BuildTimelineAnalyzer::OnInvocation) ||
         CppBI::MatchEventInMemberFunction(eventStack.Back(), this, &BuildTimelineAnalyzer::OnFrontEndFile) ||
         CppBI::MatchEventInMemberFunction(eventStack.Back(), this, &BuildTimelineAnalyzer::OnFunction) ||
-        CppBI::MatchEventStackInMemberFunction(eventStack,   this, &BuildTimelineAnalyzer::OnTemplateInstantiation);
+        CppBI::MatchEventStackInMemberFunction(eventStack,   this, &BuildTimelineAnalyzer::OnTemplateInstantiation) ||
+        CppBI::MatchEventStackInMemberFunction(eventStack,   this, &BuildTimelineAnalyzer::OnThread);
 
     return CppBI::AnalysisControl::CONTINUE;
 }
@@ -152,6 +153,11 @@ void BuildTimelineAnalyzer::OnTemplateInstantiationFinished(const CppBI::Activit
     }
 }
 
+void BuildTimelineAnalyzer::OnThread(const CppBI::Activities::Activity& parent, const CppBI::Activities::Thread& thread)
+{
+    m_buildTimeline.UpdateEntryName(thread.EventInstanceId(), std::string(parent.EventName()) + std::string(thread.EventName()));
+}
+
 // ----------------------------------------------------------------------------
 
 void BuildTimelineAnalyzer::OnSymbolNameEvent(const CppBI::SimpleEvents::SymbolName& event)

src/BuildAnalyzer/Analyzers/BuildTimeline/BuildTimelineAnalyzer.h

@@ -43,6 +43,7 @@ class BuildTimelineAnalyzer : public CppBI::IAnalyzer
     void OnFunctionFinished(const CppBI::Activities::Activity& parent, const CppBI::Activities::Function& function);
     void OnTemplateInstantiation(const CppBI::Activities::TemplateInstantiation& templateInstantiation);
     void OnTemplateInstantiationFinished(const CppBI::Activities::Activity& parent, const CppBI::Activities::TemplateInstantiation& templateInstantiation);
+    void OnThread(const CppBI::Activities::Activity& parent, const CppBI::Activities::Thread& thread);
 
     // specific event handling
     void OnSymbolNameEvent(const CppBI::SimpleEvents::SymbolName& event);