diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 518e7d0d..6bc5e082 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -319,7 +319,7 @@ bool View::DrawImpl() keepOpenPtr = &keepOpen; } - std::lock_guard lock( m_worker.GetDataLock() ); + std::lock_guard lock( m_worker.GetDataLock() ); ImGui::Begin( m_worker.GetCaptureName().c_str(), keepOpenPtr, ImVec2( 1550, 800 ), -1, ImGuiWindowFlags_NoScrollbar ); if( !m_worker.IsDataStatic() ) { @@ -382,7 +382,7 @@ void View::DrawConnection() const auto cs = ty * 0.9f; { - std::lock_guard lock( m_worker.GetMbpsDataLock() ); + std::lock_guard lock( m_worker.GetMbpsDataLock() ); ImGui::Begin( m_worker.GetAddr().c_str(), nullptr, ImGuiWindowFlags_AlwaysAutoResize ); const auto& mbpsVector = m_worker.GetMbpsData(); const auto mbps = mbpsVector.back(); @@ -406,7 +406,7 @@ void View::DrawConnection() const auto wpos = ImGui::GetWindowPos() + ImGui::GetWindowContentRegionMin(); ImGui::GetWindowDrawList()->AddCircleFilled( wpos + ImVec2( 1 + cs * 0.5, 3 + ty * 0.5 ), cs * 0.5, m_worker.IsConnected() ? 0xFF2222CC : 0xFF444444, 10 ); - std::lock_guard lock( m_worker.GetDataLock() ); + std::lock_guard lock( m_worker.GetDataLock() ); { const auto sz = m_worker.GetFrameCount(); if( sz > 1 ) diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 5c9f0ca7..0d6b4919 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -457,7 +457,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask ) auto& zones = v.second.zones; pdqsort_branchless( zones.begin(), zones.end(), []( const auto& lhs, const auto& rhs ) { return lhs.zone->start < rhs.zone->start; } ); } - std::lock_guard lock( m_data.lock ); + std::lock_guard lock( m_data.lock ); m_data.sourceLocationZonesReady = true; } ); #endif @@ -857,7 +857,7 @@ void Worker::Exec() const char* end = buf + sz; { - std::lock_guard lock( m_data.lock ); + std::lock_guard lock( m_data.lock ); while( ptr < end ) { auto ev = (const QueueItem*)ptr; @@ -875,7 +875,7 @@ void Worker::Exec() enum { MbpsUpdateTime = 200 }; if( td > MbpsUpdateTime ) { - std::lock_guard lock( m_mbpsData.lock ); + std::lock_guard lock( m_mbpsData.lock ); m_mbpsData.mbps.erase( m_mbpsData.mbps.begin() ); m_mbpsData.mbps.emplace_back( bytes / ( td * 125.f ) ); m_mbpsData.compRatio = float( bytes ) / decBytes; @@ -1925,7 +1925,7 @@ void Worker::ReconstructMemAllocPlot() PlotData* plot; { - std::lock_guard lock( m_data.lock ); + std::lock_guard lock( m_data.lock ); plot = m_slab.AllocInit(); } @@ -2007,7 +2007,7 @@ void Worker::ReconstructMemAllocPlot() plot->min = 0; plot->max = max; - std::lock_guard lock( m_data.lock ); + std::lock_guard lock( m_data.lock ); m_data.plots.insert( m_data.plots.begin(), plot ); m_data.memory.plot = plot; }