mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-12-02 09:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use precalculated min/max time spans.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-03-18 20:20:24 +01:00
parent 0f1f7c6813
commit 3ac98beb5a
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server/TracyView.cpp
View File

@ -2734,7 +2734,7 @@ void View::DrawFindZone()
for( auto& v : m_findZone.match ) for( auto& v : m_findZone.match )
{ {
auto& srcloc = m_worker.GetSourceLocation( v ); auto& srcloc = m_worker.GetSourceLocation( v );
auto& zones = m_worker.GetZonesForSourceLocation( v ); auto& zones = m_worker.GetZonesForSourceLocation( v ).zones;
ImGui::PushID( idx ); ImGui::PushID( idx );
ImGui::RadioButton( m_worker.GetString( srcloc.name.active ? srcloc.name : srcloc.function ), &m_findZone.selMatch, idx++ ); ImGui::RadioButton( m_worker.GetString( srcloc.name.active ? srcloc.name : srcloc.function ), &m_findZone.selMatch, idx++ );
ImGui::SameLine(); ImGui::SameLine();
@ -2755,19 +2755,10 @@ void View::DrawFindZone()
{ {
const auto ty = ImGui::GetFontSize(); const auto ty = ImGui::GetFontSize();
int64_t tmin = std::numeric_limits<int64_t>::max(); auto& zoneData = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] );
int64_t tmax = std::numeric_limits<int64_t>::min(); auto& zones = zoneData.zones;
auto tmin = zoneData.min;
auto& zones = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] ); auto tmax = zoneData.max;
for( auto& ev : zones )
{
const auto timeSpan = m_worker.GetZoneEndDirect( *ev ) - ev->start;
if( timeSpan != 0 )
{
tmin = std::min( tmin, timeSpan );
tmax = std::max( tmax, timeSpan );
}
}
if( tmin != std::numeric_limits<int64_t>::max() ) if( tmin != std::numeric_limits<int64_t>::max() )
{ {
@ -2812,7 +2803,6 @@ void View::DrawFindZone()
{ {
const auto tMinLog = log10( tmin ); const auto tMinLog = log10( tmin );
const auto idt = numBins / ( log10( tmax ) - tMinLog ); const auto idt = numBins / ( log10( tmax ) - tMinLog );
auto& zones = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] );
for( auto& ev : zones ) for( auto& ev : zones )
{ {
const auto timeSpan = m_worker.GetZoneEndDirect( *ev ) - ev->start; const auto timeSpan = m_worker.GetZoneEndDirect( *ev ) - ev->start;
@ -2828,7 +2818,6 @@ void View::DrawFindZone()
else else
{ {
const auto idt = numBins / dt; const auto idt = numBins / dt;
auto& zones = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] );
for( auto& ev : zones ) for( auto& ev : zones )
{ {
const auto timeSpan = m_worker.GetZoneEndDirect( *ev ) - ev->start; const auto timeSpan = m_worker.GetZoneEndDirect( *ev ) - ev->start;
@ -2848,7 +2837,6 @@ void View::DrawFindZone()
{ {
const auto tMinLog = log10( tmin ); const auto tMinLog = log10( tmin );
const auto idt = numBins / ( log10( tmax ) - tMinLog ); const auto idt = numBins / ( log10( tmax ) - tMinLog );
auto& zones = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] );
for( auto& ev : zones ) for( auto& ev : zones )
{ {
const auto timeSpan = m_worker.GetZoneEndDirect( *ev ) - ev->start; const auto timeSpan = m_worker.GetZoneEndDirect( *ev ) - ev->start;
@ -2863,7 +2851,6 @@ void View::DrawFindZone()
else else
{ {
const auto idt = numBins / dt; const auto idt = numBins / dt;
auto& zones = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] );
for( auto& ev : zones ) for( auto& ev : zones )
{ {
const auto timeSpan = m_worker.GetZoneEndDirect( *ev ) - ev->start; const auto timeSpan = m_worker.GetZoneEndDirect( *ev ) - ev->start;
@ -3145,7 +3132,7 @@ void View::DrawFindZone()
ImGui::Separator(); ImGui::Separator();
ImGui::Text( "Found zones:" ); ImGui::Text( "Found zones:" );
auto& zones = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] ); auto& zones = m_worker.GetZonesForSourceLocation( m_findZone.match[m_findZone.selMatch] ).zones;
auto sz = zones.size(); auto sz = zones.size();
for( size_t i=m_findZone.processed; i<sz; i++ ) for( size_t i=m_findZone.processed; i<sz; i++ )
{ {
@ -3495,7 +3482,7 @@ void View::FindZones()
auto it = m_findZone.match.begin(); auto it = m_findZone.match.begin();
while( it != m_findZone.match.end() ) while( it != m_findZone.match.end() )
{ {
if( m_worker.GetZonesForSourceLocation( *it ).empty() ) if( m_worker.GetZonesForSourceLocation( *it ).zones.empty() )
{ {
it = m_findZone.match.erase( it ); it = m_findZone.match.erase( it );
} }

6
server/TracyWorker.cpp
View File

@ -418,11 +418,11 @@ std::vector<int32_t> Worker::GetMatchingSourceLocation( const char* query ) cons
} }
#ifndef TRACY_NO_STATISTICS #ifndef TRACY_NO_STATISTICS
const Vector<ZoneEvent*>& Worker::GetZonesForSourceLocation( int32_t srcloc ) const const Worker::SourceLocationZones& Worker::GetZonesForSourceLocation( int32_t srcloc ) const
{ {
static const Vector<ZoneEvent*> empty; static const SourceLocationZones empty;
auto it = m_data.sourceLocationZones.find( srcloc ); auto it = m_data.sourceLocationZones.find( srcloc );
return it != m_data.sourceLocationZones.end() ? it->second.zones : empty; return it != m_data.sourceLocationZones.end() ? it->second : empty;
} }
#endif #endif

2
server/TracyWorker.hpp
View File

@ -123,7 +123,7 @@ public:
std::vector<int32_t> GetMatchingSourceLocation( const char* query ) const; std::vector<int32_t> GetMatchingSourceLocation( const char* query ) const;
#ifndef TRACY_NO_STATISTICS #ifndef TRACY_NO_STATISTICS
const Vector<ZoneEvent*>& GetZonesForSourceLocation( int32_t srcloc ) const; const SourceLocationZones& GetZonesForSourceLocation( int32_t srcloc ) const;
#endif #endif
NonRecursiveBenaphore& GetMbpsDataLock() { return m_mbpsData.lock; } NonRecursiveBenaphore& GetMbpsDataLock() { return m_mbpsData.lock; }