Fix data race with mixer thread performance measurements
This commit is contained in:
@@ -25,8 +25,19 @@
|
|||||||
#include "game/game_instance.hpp"
|
#include "game/game_instance.hpp"
|
||||||
|
|
||||||
#include "widgets/framerate_widget.h"
|
#include "widgets/framerate_widget.h"
|
||||||
|
|
||||||
|
#include <atomic>
|
||||||
|
#include <mutex>
|
||||||
|
#if defined(__MINGW32__)
|
||||||
|
#include "3rdparty/mingw-std-threads/mingw.mutex.h"
|
||||||
|
#endif
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
#include "safeguards.h"
|
#include "safeguards.h"
|
||||||
|
|
||||||
|
static std::mutex _sound_perf_lock;
|
||||||
|
static std::atomic<bool> _sound_perf_pending;
|
||||||
|
static std::vector<TimingMeasurement> _sound_perf_measurements;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Private declarations for performance measurement implementation
|
* Private declarations for performance measurement implementation
|
||||||
@@ -251,6 +262,15 @@ PerformanceMeasurer::~PerformanceMeasurer()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (this->elem == PFE_SOUND) {
|
||||||
|
TimingMeasurement end = GetPerformanceTimer();
|
||||||
|
std::lock_guard lk(_sound_perf_lock);
|
||||||
|
if (_sound_perf_measurements.size() >= NUM_FRAMERATE_POINTS * 2) return;
|
||||||
|
_sound_perf_measurements.push_back(this->start_time);
|
||||||
|
_sound_perf_measurements.push_back(end);
|
||||||
|
_sound_perf_pending.store(true, std::memory_order_release);
|
||||||
|
return;
|
||||||
|
}
|
||||||
_pf_data[this->elem].Add(this->start_time, GetPerformanceTimer());
|
_pf_data[this->elem].Add(this->start_time, GetPerformanceTimer());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1078,3 +1098,15 @@ void ConPrintFramerate()
|
|||||||
IConsoleWarning("No performance measurements have been taken yet");
|
IConsoleWarning("No performance measurements have been taken yet");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ProcessPendingPerformanceMeasurements()
|
||||||
|
{
|
||||||
|
if (_sound_perf_pending.load(std::memory_order_acquire)) {
|
||||||
|
std::lock_guard lk(_sound_perf_lock);
|
||||||
|
for (size_t i = 0; i < _sound_perf_measurements.size(); i += 2) {
|
||||||
|
_pf_data[PFE_SOUND].Add(_sound_perf_measurements[i], _sound_perf_measurements[i + 1]);
|
||||||
|
}
|
||||||
|
_sound_perf_measurements.clear();
|
||||||
|
_sound_perf_pending.store(false, std::memory_order_relaxed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -3237,6 +3237,9 @@ void UpdateWindows()
|
|||||||
PerformanceMeasurer framerate(PFE_DRAWING);
|
PerformanceMeasurer framerate(PFE_DRAWING);
|
||||||
PerformanceAccumulator::Reset(PFE_DRAWWORLD);
|
PerformanceAccumulator::Reset(PFE_DRAWWORLD);
|
||||||
|
|
||||||
|
extern void ProcessPendingPerformanceMeasurements();
|
||||||
|
ProcessPendingPerformanceMeasurements();
|
||||||
|
|
||||||
CallWindowRealtimeTickEvent(delta_ms);
|
CallWindowRealtimeTickEvent(delta_ms);
|
||||||
|
|
||||||
static GUITimer network_message_timer = GUITimer(1);
|
static GUITimer network_message_timer = GUITimer(1);
|
||||||
|
Reference in New Issue
Block a user