Skip to content

Commit d9663f3

Browse files
authored
Merge pull request #47 from MetanoKid/thread-activity-rename
Renames Thread activities by prepending parent activity name
2 parents 553dcdf + 48a47f6 commit d9663f3

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/BuildAnalyzer/Analyzers/BuildTimeline/BuildTimelineAnalyzer.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ CppBI::AnalysisControl BuildTimelineAnalyzer::OnStartActivity(const CppBI::Event
2727
CppBI::MatchEventInMemberFunction(eventStack.Back(), this, &BuildTimelineAnalyzer::OnInvocation) ||
2828
CppBI::MatchEventInMemberFunction(eventStack.Back(), this, &BuildTimelineAnalyzer::OnFrontEndFile) ||
2929
CppBI::MatchEventInMemberFunction(eventStack.Back(), this, &BuildTimelineAnalyzer::OnFunction) ||
30-
CppBI::MatchEventStackInMemberFunction(eventStack, this, &BuildTimelineAnalyzer::OnTemplateInstantiation);
30+
CppBI::MatchEventStackInMemberFunction(eventStack, this, &BuildTimelineAnalyzer::OnTemplateInstantiation) ||
31+
CppBI::MatchEventStackInMemberFunction(eventStack, this, &BuildTimelineAnalyzer::OnThread);
3132

3233
return CppBI::AnalysisControl::CONTINUE;
3334
}
@@ -113,6 +114,11 @@ void BuildTimelineAnalyzer::OnTemplateInstantiation(const CppBI::Activities::Tem
113114
result.first->second.push_back(templateInstantiation.EventInstanceId());
114115
}
115116

117+
void BuildTimelineAnalyzer::OnThread(const CppBI::Activities::Activity& parent, const CppBI::Activities::Thread& thread)
118+
{
119+
m_buildTimeline.UpdateEntryName(thread.EventInstanceId(), std::string(parent.EventName()) + std::string(thread.EventName()));
120+
}
121+
116122
// ----------------------------------------------------------------------------
117123

118124
void BuildTimelineAnalyzer::OnSymbolNameEvent(const CppBI::SimpleEvents::SymbolName& event)

src/BuildAnalyzer/Analyzers/BuildTimeline/BuildTimelineAnalyzer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class BuildTimelineAnalyzer : public CppBI::IAnalyzer
3939
void OnFrontEndFile(const CppBI::Activities::FrontEndFile& frontEndFile);
4040
void OnFunction(const CppBI::Activities::Function& function);
4141
void OnTemplateInstantiation(const CppBI::Activities::TemplateInstantiation& templateInstantiation);
42+
void OnThread(const CppBI::Activities::Activity& parent, const CppBI::Activities::Thread& thread);
4243

4344
// specific event handling
4445
void OnSymbolNameEvent(const CppBI::SimpleEvents::SymbolName& event);

0 commit comments

Comments
 (0)