mirror of
https://github.com/wolfpld/tracy.git
synced 2024-11-26 16:04:34 +00:00
Merge pull request #434 from haCo77/master
fix tracy worker threads conflict
This commit is contained in:
commit
1b728b50bf
@ -7162,6 +7162,7 @@ void Worker::ReconstructMemAllocPlot( MemData& mem )
|
|||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock( m_data.lock );
|
std::lock_guard<std::mutex> lock( m_data.lock );
|
||||||
plot = m_slab.AllocInit<PlotData>();
|
plot = m_slab.AllocInit<PlotData>();
|
||||||
|
plot->data.reserve_exact( psz, m_slab );
|
||||||
}
|
}
|
||||||
|
|
||||||
plot->name = mem.name;
|
plot->name = mem.name;
|
||||||
@ -7170,7 +7171,6 @@ void Worker::ReconstructMemAllocPlot( MemData& mem )
|
|||||||
plot->showSteps = true;
|
plot->showSteps = true;
|
||||||
plot->fill = true;
|
plot->fill = true;
|
||||||
plot->color = 0;
|
plot->color = 0;
|
||||||
plot->data.reserve_exact( psz, m_slab );
|
|
||||||
|
|
||||||
auto aptr = mem.data.begin();
|
auto aptr = mem.data.begin();
|
||||||
auto aend = mem.data.end();
|
auto aend = mem.data.end();
|
||||||
|
Loading…
Reference in New Issue
Block a user