diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-27 13:56:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 13:56:58 +0200 |
| commit | 6e6fe2b025cf2d2e6ecbc2d536a6ed614f6486c6 (patch) | |
| tree | 5347db9b0a50bb4a39d453ca46eefc9eea12f180 /core/debugger | |
| parent | 17374944796a9338a2225473c9af693b4b578e18 (diff) | |
| parent | 331f1662df41b4e7afff30d2fe4019a413499c1c (diff) | |
Merge pull request #59582 from Faless/net/4.x_tcp_explicit_poll
Diffstat (limited to 'core/debugger')
| -rw-r--r-- | core/debugger/remote_debugger_peer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/debugger/remote_debugger_peer.cpp b/core/debugger/remote_debugger_peer.cpp index 950500884e..e9362b4ea4 100644 --- a/core/debugger/remote_debugger_peer.cpp +++ b/core/debugger/remote_debugger_peer.cpp @@ -93,7 +93,7 @@ RemoteDebuggerPeerTCP::~RemoteDebuggerPeerTCP() { } void RemoteDebuggerPeerTCP::_write_out() { - while (tcp_client->poll(NetSocket::POLL_TYPE_OUT) == OK) { + while (tcp_client->get_status() == StreamPeerTCP::STATUS_CONNECTED && tcp_client->wait(NetSocket::POLL_TYPE_OUT) == OK) { uint8_t *buf = out_buf.ptrw(); if (out_left <= 0) { if (out_queue.size() == 0) { @@ -119,7 +119,7 @@ void RemoteDebuggerPeerTCP::_write_out() { } void RemoteDebuggerPeerTCP::_read_in() { - while (tcp_client->poll(NetSocket::POLL_TYPE_IN) == OK) { + while (tcp_client->get_status() == StreamPeerTCP::STATUS_CONNECTED && tcp_client->wait(NetSocket::POLL_TYPE_IN) == OK) { uint8_t *buf = in_buf.ptrw(); if (in_left <= 0) { if (in_queue.size() > max_queued_messages) { @@ -167,6 +167,7 @@ Error RemoteDebuggerPeerTCP::connect_to_host(const String &p_host, uint16_t p_po tcp_client->connect_to_host(ip, port); for (int i = 0; i < tries; i++) { + tcp_client->poll(); if (tcp_client->get_status() == StreamPeerTCP::STATUS_CONNECTED) { print_verbose("Remote Debugger: Connected!"); break; @@ -213,6 +214,7 @@ void RemoteDebuggerPeerTCP::poll() { } void RemoteDebuggerPeerTCP::_poll() { + tcp_client->poll(); if (connected) { _write_out(); _read_in(); |