mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Editor debugger now always handle connections.

Browse Source 
The editor debugger used to only take the first client connection,
leaving potential new connections hanging until TCP timeout.
This caused a lock after some time when running multiple game/editor
instances, as the client will fill the write buffer, and then lock until
timeout (as the editor server would never read from that socket).

The editor now drops new connections immediately if it is already
connected to a client.
This commit is contained in:
Fabio Alessandrelli 2019-06-04 07:37:57 +02:00
parent 774a9fde84
commit 108de5a734
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editor/script_editor_debugger.cpp
View File

@ -1132,10 +1132,13 @@ void ScriptEditorDebugger::_notification(int p_what) {
last_warning_count = warning_count; last_warning_count = warning_count;
} }
if (connection.is_null()) { if (server->is_connection_available()) {
if (connection.is_valid()) {
if (server->is_connection_available()) { // We already have a valid connection. Disconnecting any new connecting client to prevent it from hanging.
// (If we don't keep a reference to the connection it will be destroyed and disconnect_from_host will be called internally)
server->take_connection();
} else {
// We just got the first connection.
connection = server->take_connection(); connection = server->take_connection();
if (connection.is_null()) if (connection.is_null())
break; break;
@ -1169,12 +1172,11 @@ void ScriptEditorDebugger::_notification(int p_what) {
if (profiler->is_profiling()) { if (profiler->is_profiling()) {
_profiler_activate(true); _profiler_activate(true);
} }
} else {
break;
} }
}; }
if (connection.is_null())
break;
if (!connection->is_connected_to_host()) { if (!connection->is_connected_to_host()) {
stop(); stop();