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

Add support for custom text in ImportEventTimeline.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-05-12 11:44:36 +02:00
parent 1c8aece53c
commit 8e11cd5ebb
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
import-chrome/src/import-chrome.cpp
View File

@ -76,6 +76,7 @@ int main( int argc, char** argv )
v["tid"].get<uint64_t>(), v["tid"].get<uint64_t>(),
uint64_t( v["ts"].get<double>() * 1000. ), uint64_t( v["ts"].get<double>() * 1000. ),
v["name"].get<std::string>(), v["name"].get<std::string>(),
"",
false false
} ); } );
} }
@ -85,6 +86,7 @@ int main( int argc, char** argv )
v["tid"].get<uint64_t>(), v["tid"].get<uint64_t>(),
uint64_t( v["ts"].get<double>() * 1000. ), uint64_t( v["ts"].get<double>() * 1000. ),
"", "",
"",
true true
} ); } );
} }
@ -94,8 +96,8 @@ int main( int argc, char** argv )
const auto ts0 = uint64_t( v["ts"].get<double>() * 1000. ); const auto ts0 = uint64_t( v["ts"].get<double>() * 1000. );
const auto ts1 = v["dur"].is_object() ? ts0 + uint64_t( v["dur"].get<double>() * 1000. ) : ts0; const auto ts1 = v["dur"].is_object() ? ts0 + uint64_t( v["dur"].get<double>() * 1000. ) : ts0;
const auto name = v["name"].get<std::string>(); const auto name = v["name"].get<std::string>();
timeline.emplace_back( tracy::Worker::ImportEventTimeline { tid, ts0, name, false } ); timeline.emplace_back( tracy::Worker::ImportEventTimeline { tid, ts0, name, "", false } );
timeline.emplace_back( tracy::Worker::ImportEventTimeline { tid, ts1, "", true } ); timeline.emplace_back( tracy::Worker::ImportEventTimeline { tid, ts1, "", "", true } );
} }
else if( type == "i" || type == "I" ) else if( type == "i" || type == "I" )
{ {

6
server/TracyWorker.cpp
View File

@ -328,6 +328,12 @@ Worker::Worker( const std::string& program, const std::vector<ImportEventTimelin
zone->SetEnd( -1 ); zone->SetEnd( -1 );
zone->SetChild( -1 ); zone->SetChild( -1 );
if( !v.text.empty() )
{
auto& extra = RequestZoneExtra( *zone );
extra.text = StringIdx( StoreString( v.text.c_str(), v.text.size() ).idx );
}
m_threadCtxData = NoticeThread( v.tid ); m_threadCtxData = NoticeThread( v.tid );
NewZone( zone, v.tid ); NewZone( zone, v.tid );
} }

1
server/TracyWorker.hpp
View File

@ -95,6 +95,7 @@ public:
uint64_t tid; uint64_t tid;
uint64_t timestamp; uint64_t timestamp;
std::string name; std::string name;
std::string text;
bool isEnd; bool isEnd;
}; };