godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88124 from Rubonnek/fix-efs-scan-done-race 

Fix data race against `EditorFileSystem.scanning_changes_done`
This commit is contained in:
Rémi Verschelde 2024-02-09 18:09:18 +01:00
parent b457a30311 9790b992ba
commit 27e575a4dd
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_file_system.cpp
View File

@ -1183,7 +1183,7 @@ void EditorFileSystem::_thread_func_sources(void *_userdata) {
sp.low = 0; sp.low = 0;
efs->_scan_fs_changes(efs->filesystem, sp); efs->_scan_fs_changes(efs->filesystem, sp);
} }
efs->scanning_changes_done = true; efs->scanning_changes_done.set();
} }
void EditorFileSystem::scan_changes() { void EditorFileSystem::scan_changes() {
@ -1197,7 +1197,7 @@ void EditorFileSystem::scan_changes() {
_update_extensions(); _update_extensions();
sources_changed.clear(); sources_changed.clear();
scanning_changes = true; scanning_changes = true;
scanning_changes_done = false; scanning_changes_done.clear();
if (!use_threads) { if (!use_threads) {
if (filesystem) { if (filesystem) {
@ -1216,7 +1216,7 @@ void EditorFileSystem::scan_changes() {
} }
} }
scanning_changes = false; scanning_changes = false;
scanning_changes_done = true; scanning_changes_done.set();
emit_signal(SNAME("sources_changed"), sources_changed.size() > 0); emit_signal(SNAME("sources_changed"), sources_changed.size() > 0);
} else { } else {
ERR_FAIL_COND(thread_sources.is_started()); ERR_FAIL_COND(thread_sources.is_started());
@ -1269,7 +1269,7 @@ void EditorFileSystem::_notification(int p_what) {
bool done_importing = false; bool done_importing = false;
if (scanning_changes) { if (scanning_changes) {
if (scanning_changes_done) { if (scanning_changes_done.is_set()) {
set_process(false); set_process(false);
if (thread_sources.is_started()) { if (thread_sources.is_started()) {

2
editor/editor_file_system.h
View File

@ -231,7 +231,7 @@ class EditorFileSystem : public Node {
Thread thread_sources; Thread thread_sources;
bool scanning_changes = false; bool scanning_changes = false;
bool scanning_changes_done = false; SafeFlag scanning_changes_done;
static void _thread_func_sources(void *_userdata); static void _thread_func_sources(void *_userdata);