zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Merge pull request #168 from jkriegshauser/improve-import

Browse Source 
Improve chrome import
This commit is contained in:
Bartosz Taudul
2021-01-22 14:57:52 +01:00
committed by GitHub
parent 9d66abd679 c96f01956d
commit ccf441176b
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/TracyWorker.hpp
+2 -1
View File
@@ -10,6 +10,7 @@
#include <string>
#include <string.h>
#include <thread>
#include <unordered_map>
#include <vector>
#include "../common/TracyForceInline.hpp"
@@ -394,7 +395,7 @@ public:
};
Worker( const char* addr, uint16_t port );
Worker( const std::string& program, const std::vector<ImportEventTimeline>& timeline, const std::vector<ImportEventMessages>& messages, const std::vector<ImportEventPlots>& plots );
Worker( const char* name, const char* program, const std::vector<ImportEventTimeline>& timeline, const std::vector<ImportEventMessages>& messages, const std::vector<ImportEventPlots>& plots, const std::unordered_map<uint64_t, std::string>& threadNames );
Worker( FileRead& f, EventType::Type eventMask = EventType::All, bool bgTasks = true );
~Worker();