mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-27 08:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store matches in a map.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-03-04 22:11:50 +01:00
parent 754279d6f1
commit f7829a7eae
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/TracyView.cpp
View File

@ -2674,7 +2674,6 @@ void View::DrawFindZone()
{ {
m_findZone.result.clear(); m_findZone.result.clear();
m_findZone.match.clear(); m_findZone.match.clear();
m_findZone.matchEnable.clear();
} }
if( ImGui::TreeNode( "Options" ) ) if( ImGui::TreeNode( "Options" ) )
@ -2692,7 +2691,6 @@ void View::DrawFindZone()
{ {
m_findZone.result.clear(); m_findZone.result.clear();
m_findZone.match.clear(); m_findZone.match.clear();
m_findZone.matchEnable.clear();
FindZones(); FindZones();
} }
@ -2701,18 +2699,19 @@ void View::DrawFindZone()
ImGui::Separator(); ImGui::Separator();
if( ImGui::TreeNode( "Matched source locations" ) ) if( ImGui::TreeNode( "Matched source locations" ) )
{ {
for( size_t i=0; i<m_findZone.match.size(); i++ ) int idx = 0;
for( auto& v : m_findZone.match )
{ {
auto& srcloc = m_worker.GetSourceLocation( m_findZone.match[i] ); auto& srcloc = m_worker.GetSourceLocation( v.first );
bool tmp = m_findZone.matchEnable[i]; bool tmp = v.second;
ImGui::PushID( (int)i ); ImGui::PushID( idx++ );
ImGui::Checkbox( m_worker.GetString( srcloc.name.active ? srcloc.name : srcloc.function ), &tmp ); ImGui::Checkbox( m_worker.GetString( srcloc.name.active ? srcloc.name : srcloc.function ), &tmp );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextColored( ImVec4( 0.5, 0.5, 0.5, 1 ), "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line ); ImGui::TextColored( ImVec4( 0.5, 0.5, 0.5, 1 ), "%s:%i", m_worker.GetString( srcloc.file ), srcloc.line );
ImGui::PopID(); ImGui::PopID();
if( m_findZone.matchEnable[i] != tmp ) if( v.second != tmp )
{ {
m_findZone.matchEnable[i] = tmp; v.second = tmp;
m_findZone.result.clear(); m_findZone.result.clear();
RecalcFindMatches(); RecalcFindMatches();
} }
@ -3266,10 +3265,14 @@ const GpuEvent* View::GetZoneParent( const GpuEvent& zone ) const
void View::FindZones() void View::FindZones()
{ {
m_findZone.match = m_worker.GetMatchingSourceLocation( m_findZone.pattern ); const auto match = m_worker.GetMatchingSourceLocation( m_findZone.pattern );
if( m_findZone.match.empty() ) return; if( match.empty() ) return;
m_findZone.matchEnable = std::vector<bool>( m_findZone.match.size(), true ); m_findZone.match.reserve( match.size() );
for( auto& v : match )
{
m_findZone.match.emplace( v, true );
}
RecalcFindMatches(); RecalcFindMatches();
} }
@ -3296,8 +3299,8 @@ void View::RecalcFindMatches( const Vector<ZoneEvent*>& events, Vector<ZoneEvent
if( out.size() >= m_findZone.maxZonesPerThread ) break; if( out.size() >= m_findZone.maxZonesPerThread ) break;
if( m_worker.GetZoneEnd( *ev ) == ev->start ) continue; if( m_worker.GetZoneEnd( *ev ) == ev->start ) continue;
auto it = std::find( m_findZone.match.begin(), m_findZone.match.end(), ev->srcloc ); auto it = m_findZone.match.find( ev->srcloc );
if( it != m_findZone.match.end() && m_findZone.matchEnable[std::distance( m_findZone.match.begin(), it )] ) if( it != m_findZone.match.end() && it->second )
{ {
out.push_back( ev ); out.push_back( ev );
} }

3
server/TracyView.hpp
View File

@ -164,8 +164,7 @@ private:
struct { struct {
bool show; bool show;
std::vector<std::unique_ptr<ThreadData>> result; std::vector<std::unique_ptr<ThreadData>> result;
std::vector<int32_t> match; flat_hash_map<int32_t, bool> match;
std::vector<bool> matchEnable;
char pattern[1024] = { "" }; char pattern[1024] = { "" };
int maxZonesPerThread = -1; int maxZonesPerThread = -1;
int maxDepth = -1; int maxDepth = -1;