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

do not mangle tid if there is no pid

Browse Source
This commit is contained in:
Simon Cruanes 2021-05-10 11:49:07 -04:00
parent d38f579ec3
commit b512ce3fa8
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,22 +148,27 @@ int main( int argc, char** argv )
std::unordered_map<uint64_t, std::string> threadNames; std::unordered_map<uint64_t, std::string> threadNames;
const auto getPseudoTid = [&](json& val) -> uint64_t { const auto getPseudoTid = [&](json& val) -> uint64_t {
uint64_t pid = 0;
if ( val.contains( "pid" ) ) {
pid = val["pid"].get<uint64_t>();
}
const auto real_tid = val["tid"].get<uint64_t>(); const auto real_tid = val["tid"].get<uint64_t>();
for ( auto &pair : tid_encoders) { if ( val.contains( "pid" ) ) {
if ( pair.pid == pid && pair.tid == real_tid ) { // there might be multiple processes so we allocate a pseudo-tid
return pair.pseudo_tid; // for each pair (pid, real_tid)
} const auto pid = val["pid"].get<uint64_t>();
}
const auto pseudo_tid = tid_encoders.size(); for ( auto &pair : tid_encoders) {
tid_encoders.emplace_back(PidTidEncoder {real_tid, pid, pseudo_tid}); if ( pair.pid == pid && pair.tid == real_tid ) {
return pseudo_tid; return pair.pseudo_tid;
}
}
const auto pseudo_tid = tid_encoders.size();
tid_encoders.emplace_back(PidTidEncoder {real_tid, pid, pseudo_tid});
return pseudo_tid;
}
else
{
return real_tid;
}
}; };
if( j.is_object() && j.contains( "traceEvents" ) ) if( j.is_object() && j.contains( "traceEvents" ) )