godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Fix data race regarding prof_time in AudioDriver and AudioServer

Browse Source
This commit is contained in:
jsjtxietian
2024-02-06 11:29:44 +08:00
parent b4e2a24c1f
commit cf1ede9129
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
servers/audio_server.cpp
View File

@@ -316,7 +316,7 @@ void AudioServer::_driver_process(int p_frames, int32_t *p_buffer) {
}
#ifdef DEBUG_ENABLED
prof_time += OS::get_singleton()->get_ticks_usec() - prof_ticks;
prof_time.add(OS::get_singleton()->get_ticks_usec() - prof_ticks);
#endif
}
@@ -1400,7 +1400,7 @@ void AudioServer::update() {
// Driver time includes server time + effects times
// Server time includes effects times
uint64_t driver_time = AudioDriver::get_singleton()->get_profiling_time();
uint64_t server_time = prof_time;
uint64_t server_time = prof_time.get();
// Subtract the server time from the driver time
if (driver_time > server_time) {
@@ -1459,7 +1459,7 @@ void AudioServer::update() {
}
AudioDriver::get_singleton()->reset_profiling_time();
prof_time = 0;
prof_time.set(0);
#endif
for (CallbackItem *ci : update_callback_list) {