diff --git a/server/TracyVersion.hpp b/server/TracyVersion.hpp index 5cc38dd2..791a330f 100644 --- a/server/TracyVersion.hpp +++ b/server/TracyVersion.hpp @@ -7,7 +7,7 @@ namespace Version { enum { Major = 0 }; enum { Minor = 6 }; -enum { Patch = 11 }; +enum { Patch = 12 }; } } diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index ef1dfa4f..66599e69 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -464,6 +464,12 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks ) { f.Read( m_data.cpuArch ); } + if( fileVer >= FileVersion( 0, 6, 12 ) ) + { + f.Read( m_data.cpuId ); + f.Read( m_data.cpuManufacturer, 12 ); + m_data.cpuManufacturer[12] = '\0'; + } uint64_t sz; { @@ -2901,6 +2907,9 @@ void Worker::Exec() m_captureTime = welcome.epoch; m_ignoreMemFreeFaults = welcome.onDemand || welcome.isApple; m_data.cpuArch = (CpuArchitecture)welcome.cpuArch; + m_data.cpuId = welcome.cpuId; + memcpy( m_data.cpuManufacturer, welcome.cpuManufacturer, 12 ); + m_data.cpuManufacturer[12] = '\0'; char dtmp[64]; time_t date = welcome.epoch; @@ -6694,6 +6703,8 @@ void Worker::Write( FileWrite& f ) f.Write( &m_pid, sizeof( m_pid ) ); f.Write( &m_samplingPeriod, sizeof( m_samplingPeriod ) ); f.Write( &m_data.cpuArch, sizeof( m_data.cpuArch ) ); + f.Write( &m_data.cpuId, sizeof( m_data.cpuId ) ); + f.Write( m_data.cpuManufacturer, 12 ); uint64_t sz = m_captureName.size(); f.Write( &sz, sizeof( sz ) ); diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp index ca93ba6e..b2f45d76 100644 --- a/server/TracyWorker.hpp +++ b/server/TracyWorker.hpp @@ -209,6 +209,8 @@ private: int64_t lastTime = 0; uint64_t frameOffset = 0; CpuArchitecture cpuArch = CpuArchUnknown; + uint32_t cpuId = 0; + char cpuManufacturer[13]; unordered_flat_map strings; Vector stringData;