Fix freeze after building C# project with a lot of files #92893
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hilderin
force-pushed
the
fix-freeze-after-building-c#
branch
from
27cd994 to
2f34bbe
Compare
raulsntos
requested changes
Jun 8, 2024
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
Outdated
Show resolved
Hide resolved
modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/NativeFuncs.cs
Outdated
Show resolved
Hide resolved
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
Outdated
Show resolved
Hide resolved
Hilderin
force-pushed
the
fix-freeze-after-building-c#
branch
from
2f34bbe to
6d1e5b0
Compare
|
All the changes should be done. Thanks for your comments. |
raulsntos
reviewed
Jun 8, 2024
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
Outdated
Show resolved
Hide resolved
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
Outdated
Show resolved
Hide resolved
Hilderin
force-pushed
the
fix-freeze-after-building-c#
branch
from
6d1e5b0 to
893fdd3
Compare
Hilderin
force-pushed
the
fix-freeze-after-building-c#
branch
from
893fdd3 to
6fecb8e
Compare
editor/editor_file_system.cpp
Outdated
| if (!fs) { | ||
| return; | ||
| void EditorFileSystem::update_files(const Vector<String> &p_script_paths) { | ||
| for (String file : p_script_paths) { |
There was a problem hiding this comment.
Suggested change
| for (String file : p_script_paths) { | |
| for (const String &file : p_script_paths) { |
Or is there a specific reason you didn't apply that part? This saves copying and the values aren't (and shouldn't) be modified
Hilderin
force-pushed
the
fix-freeze-after-building-c#
branch
from
6fecb8e to
7cc973b
Compare
raulsntos
reviewed
Jun 8, 2024
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
Outdated
Show resolved
Hide resolved
Hilderin
force-pushed
the
fix-freeze-after-building-c#
branch
from
7cc973b to
47b4acf
Compare
raulsntos
approved these changes
Jun 9, 2024
KoBeWi
reviewed
Jun 9, 2024
Hilderin
force-pushed
the
fix-freeze-after-building-c#
branch
from
47b4acf to
cc990ef
Compare
|
Thanks! |
Hilderin
added a commit
to Hilderin/godot
that referenced
this pull request
Jun 11, 2024
akien-mga
added a commit
that referenced
this pull request
Jun 11, 2024
Fix EditorFileSystem `update_files` after #92893
akien-mga
changed the title
MewPurPur
pushed a commit
to MewPurPur/godot
that referenced
this pull request
Jul 11, 2024
sorascode
pushed a commit
to sorascode/godot-soras-version
that referenced
this pull request
Jul 22, 2024
2nafish117
pushed a commit
to 2nafish117/godot
that referenced
this pull request
Aug 5, 2024
chryan
pushed a commit
to chryan/godot
that referenced
this pull request
Aug 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #92485
With the MRP project, on Godot 4.2, it took 1 min after rebuild.
With this modification, it now takes less then 1 sec.
I added the method
update_filesineditor_file_systemthat can take a list of files in parameter. Instead of callingupdates_filefromScriptManagerBridgefor each file, I call this new method only once.I was the first time that I tried to modify the native functions between C++ and C# but I think I figured it out!!