Skip to content

TCP connect and send delay fix #6213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 5, 2019
Merged

TCP connect and send delay fix #6213

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c4a3ec
TCP connect and send delay fix
emelianov Jun 20, 2019
efde126
Put back delay comments
emelianov Jun 21, 2019
655ad2e
Merge branch 'master' into tcp_delay_fix
emelianov Jun 24, 2019
d7c11c9
Change comment lines
emelianov Jul 4, 2019
62fb04f
Merge branch 'master' into tcp_delay_fix
emelianov Jul 4, 2019
ea799a7
Merge branch 'master' into tcp_delay_fix
devyte Jul 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions libraries/ESP8266WiFi/src/include/ClientContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,11 @@ class ClientContext
}
_connect_pending = 1;
_op_start_time = millis();
// This delay will be interrupted by esp_schedule in the connect callback
delay(_timeout_ms);
// Following delay will be interrupted by connect callback
for (decltype(_timeout_ms) i = 0; _connect_pending && i < _timeout_ms; i++) {
// Give scheduled functions a chance to run (e.g. Ethernet uses recurrent)
delay(1);
}
_connect_pending = 0;
if (!_pcb) {
DEBUGV(":cabrt\r\n");
Expand Down Expand Up @@ -456,8 +459,11 @@ class ClientContext
}

_send_waiting = true;
// This delay will be interrupted by esp_schedule on next received ack
delay(_timeout_ms);
// Following delay will be interrupted by on next received ack
for (decltype(_timeout_ms) i = 0; _send_waiting && i < _timeout_ms; i++) {
// Give scheduled functions a chance to run (e.g. Ethernet uses recurrent)
delay(1);
}
} while(true);
_send_waiting = false;

Expand Down Expand Up @@ -603,6 +609,7 @@ class ClientContext
(void) pcb;
assert(pcb == _pcb);
assert(_connect_pending);
_connect_pending = 0;
esp_schedule();
return ERR_OK;
}
Expand Down