djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

picow: depending on memory pressure, may only be able to write 1 MSS

Browse Source 
Foamyguy discovered that trying to send >2920 bytes at once consistently
failed. I further discovered that sometimes trying to send >1460 bytes
would fail too.  By "fail", I mean that it would take a very long time
(around 200 * 50ms) before erroneously reporting that all bytes were
written.

In my testing, this change causes larger writes to successfully
send either 2920 or 1460 bytes (possibly after doing some 50ms waits
for a previous packet to clear).

The documentation of socket.send always stated that it COULD send fewer
bytes than requested, but adafruit_httpserver assumed that the number
of requested bytes were always sent, so after this change alone,
adafruit_httpserver will still not work properly.

Closes: #7077 (albeit fixes are needed in adafruit_httpserver too)
This commit is contained in:
Jeff Epler 2022-10-17 19:09:28 -05:00
parent 861b22730e
commit 57756863ef
No known key found for this signature in database
GPG Key ID: D5BF15AB975AB4DE
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/raspberrypi/common-hal/socketpool/Socket.c
View File

@ -505,8 +505,8 @@ STATIC mp_uint_t lwip_tcp_send(socketpool_socket_obj_t *socket, const byte *buf,
break; break;
} }
if (err == ERR_MEM && write_len > TCP_MSS) { if (err == ERR_MEM && write_len > TCP_MSS) {
// Try writing just one MSS worth of data // Decreasing the amount sent to the next lower number of MSS
write_len = TCP_MSS; write_len = (write_len - 1) / TCP_MSS * TCP_MSS;
continue; continue;
} }
err = tcp_output(socket->pcb.tcp); err = tcp_output(socket->pcb.tcp);