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

Adapt time distribution calculation to magic vectors.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-11-10 01:08:15 +01:00
parent 0c1f3ac16d
commit 50efa8f672
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
server/TracyView.cpp
View File

@ -5407,16 +5407,29 @@ void View::CalcZoneTimeData( flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_
{ {
assert( zone.Child() >= 0 ); assert( zone.Child() >= 0 );
const auto& children = m_worker.GetZoneChildren( zone.Child() ); const auto& children = m_worker.GetZoneChildren( zone.Child() );
if( children.is_magic() )
{
CalcZoneTimeDataImpl<VectorAdapterDirect<ZoneEvent>>( *(Vector<ZoneEvent>*)( &children ), data, zit, zone );
}
else
{
CalcZoneTimeDataImpl<VectorAdapterPointer<ZoneEvent>>( children, data, zit, zone );
}
}
template<typename Adapter, typename V>
void View::CalcZoneTimeDataImpl( const V& children, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>& data, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>::iterator zit, const ZoneEvent& zone )
{
Adapter a;
for( auto& child : children ) for( auto& child : children )
{ {
const auto t = m_worker.GetZoneEnd( *child ) - child->Start(); const auto t = m_worker.GetZoneEnd( a(child) ) - a(child).Start();
zit->second.time -= t; zit->second.time -= t;
} }
for( auto& child : children ) for( auto& child : children )
{ {
const auto srcloc = child->SrcLoc(); const auto srcloc = a(child).SrcLoc();
const auto t = m_worker.GetZoneEnd( *child ) - child->Start(); const auto t = m_worker.GetZoneEnd( a(child) ) - a(child).Start();
auto it = data.find( srcloc ); auto it = data.find( srcloc );
if( it == data.end() ) if( it == data.end() )
{ {
@ -5427,7 +5440,7 @@ void View::CalcZoneTimeData( flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_
it->second.time += t; it->second.time += t;
it->second.count++; it->second.count++;
} }
if( child->Child() >= 0 ) CalcZoneTimeData( data, it, *child ); if( a(child).Child() >= 0 ) CalcZoneTimeData( data, it, a(child) );
} }
} }
@ -5435,21 +5448,34 @@ void View::CalcZoneTimeData( const ContextSwitch* ctx, flat_hash_map<int16_t, Zo
{ {
assert( zone.Child() >= 0 ); assert( zone.Child() >= 0 );
const auto& children = m_worker.GetZoneChildren( zone.Child() ); const auto& children = m_worker.GetZoneChildren( zone.Child() );
if( children.is_magic() )
{
CalcZoneTimeDataImpl<VectorAdapterDirect<ZoneEvent>>( *(Vector<ZoneEvent>*)( &children ), ctx, data, zit, zone );
}
else
{
CalcZoneTimeDataImpl<VectorAdapterPointer<ZoneEvent>>( children, ctx, data, zit, zone );
}
}
template<typename Adapter, typename V>
void View::CalcZoneTimeDataImpl( const V& children, const ContextSwitch* ctx, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>& data, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>::iterator zit, const ZoneEvent& zone )
{
Adapter a;
for( auto& child : children ) for( auto& child : children )
{ {
int64_t t; int64_t t;
uint64_t cnt; uint64_t cnt;
const auto res = GetZoneRunningTime( ctx, *child, t, cnt ); const auto res = GetZoneRunningTime( ctx, a(child), t, cnt );
assert( res ); assert( res );
zit->second.time -= t; zit->second.time -= t;
} }
for( auto& child : children ) for( auto& child : children )
{ {
const auto srcloc = child->SrcLoc(); const auto srcloc = a(child).SrcLoc();
int64_t t; int64_t t;
uint64_t cnt; uint64_t cnt;
const auto res = GetZoneRunningTime( ctx, *child, t, cnt ); const auto res = GetZoneRunningTime( ctx, a(child), t, cnt );
assert( res ); assert( res );
auto it = data.find( srcloc ); auto it = data.find( srcloc );
if( it == data.end() ) if( it == data.end() )
@ -5461,7 +5487,7 @@ void View::CalcZoneTimeData( const ContextSwitch* ctx, flat_hash_map<int16_t, Zo
it->second.time += t; it->second.time += t;
it->second.count++; it->second.count++;
} }
if( child->Child() >= 0 ) CalcZoneTimeData( ctx, data, it, *child ); if( a(child).Child() >= 0 ) CalcZoneTimeData( ctx, data, it, a(child) );
} }
} }

8
server/TracyView.hpp
View File

@ -223,8 +223,12 @@ private:
int64_t GetZoneSelfTime( const GpuEvent& zone ); int64_t GetZoneSelfTime( const GpuEvent& zone );
bool GetZoneRunningTime( const ContextSwitch* ctx, const ZoneEvent& ev, int64_t& time, uint64_t& cnt ); bool GetZoneRunningTime( const ContextSwitch* ctx, const ZoneEvent& ev, int64_t& time, uint64_t& cnt );
void CalcZoneTimeData( flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>& data, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>::iterator zit, const ZoneEvent& zone ); tracy_force_inline void CalcZoneTimeData( flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>& data, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>::iterator zit, const ZoneEvent& zone );
void CalcZoneTimeData( const ContextSwitch* ctx, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>& data, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>::iterator zit, const ZoneEvent& zone ); tracy_force_inline void CalcZoneTimeData( const ContextSwitch* ctx, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>& data, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>::iterator zit, const ZoneEvent& zone );
template<typename Adapter, typename V>
void CalcZoneTimeDataImpl( const V& children, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>& data, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>::iterator zit, const ZoneEvent& zone );
template<typename Adapter, typename V>
void CalcZoneTimeDataImpl( const V& children, const ContextSwitch* ctx, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>& data, flat_hash_map<int16_t, ZoneTimeData, nohash<uint16_t>>::iterator zit, const ZoneEvent& zone );
void SetPlaybackFrame( uint32_t idx ); void SetPlaybackFrame( uint32_t idx );