Skip to content

Commit f5440b1

Browse files
RobertGnzhasenradball
authored andcommitted
WiFiClient::abort() (esp8266#8738)
Api for saving heap when Client class is used by a Server (WiFiServer class): Client = Server.available(). Suppose the local end is the server and the remote end is the client, we will deal with heap memory at the local end. When the local application (server) decides to close an active connection with a remote end it issues an Client.stop. The stop() function calls the close() function of ClientContext class which in turn calls tcp_close. The connexion is closed by tcp_close and the protocol control block (pcb) can be put in the following states depending on the requests sent by the remote: CLOSING, FIN_WAIT_1 and FIN_WAIT_2. In theses states pcbs are not freed, then consume some memory heap. If an acknowledgment from the remote end is received, the pcb enter in TIME_WAIT state for some minutes but pcbs in TIME_WAIT state are not freed. Then consume some heap memory. TIME_WAIT pcbs are automatically freed after some minutes or can be freed for instance issuing an tcp_kill_timewait() in the local application which will free the oldest pcb in TIME_WAIT state. If the connection is first closed from the remote end (the client), the local end (server) receive a connection termination request. It then acknowledge it and enter in CLOSE_WAIT state waiting for a connection termination request from the local application. It then send a termination request and enter in LAST_ACK state until it receive an acknowledgment from the remote end. After receiving the acknowledgment it enter in ClOSED state and the local pcb is freed leaving some room in the heap memory. To summarize, when a connexion termination request is send by one end (remote or local), the local pcb is not freed immediatly. This pcb can be in the following states: FIN_WAIT_1, FIN_WAIT_2, CLOSING, TIME_WAIT, CLOSE_WAIT, LAST_ACK. As a consequence, some old pcbs from old closed connections are still consuming heap memory. The local application can call tcp_kill_timewait hoping it will free some TIME_WAIT state pcbs. But if the server receive frequent connections requests and close them after sending whatever it has to send, there may be zero pcbs in TIME_WAIT state among all previously closed connections. In case of insufficient memory to accept a new connection, lwip has developped a strategy: it successively tries to kill the oldest pcb in TIME_WAIT state, or in LAST_ACK state or in CLOSING state or the oldest active connection with lower priority than the new one. As a matter of fact this "urgent" strategy is deployed only when very few heap memory remain available (less than some kb). In case of success, Client.available returns a valid Client but the local application will crash when sending or receiving data from the client (Client.read ou readuntil or available) because this need more heap memory and just some kb were freed in lwip to allocate the new pcb structure ans start the new connection. The propose API is intended to avoid this drawback by calling the abort function of ClientContext which in turn calls tcp_abort which calls tcp_abandon. The connection is aborted and notified to the client with a RESET and the pcb and ressources associated are immediately released increasing the available heap memory.
1 parent 1fa4d04 commit f5440b1

File tree

3 files changed

+45
-1
lines changed

3 files changed

+45
-1
lines changed

doc/esp8266wifi/client-class.rst

+29
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,35 @@ Default input value 0 means that effective value is left at the discretion of th
2929

3030
``stop()`` returns ``false`` in case of an issue when closing the client (for instance a timed-out ``flush``). Depending on implementation, its parameter can be passed to ``flush()``.
3131

32+
abort
33+
~~~~~
34+
35+
.. code:: cpp
36+
37+
void abort();
38+
39+
40+
Originally proposed in `#8738 <https://github.com/esp8266/Arduino/pull/8738>`__
41+
Unlike ``stop()``, immediately shuts down internal connection object.
42+
43+
Under usual circumstances, we either enter ``CLOSE_WAIT`` or ``TIME_WAIT`` state. But, the connection object is not freed right away, and requires us to either
44+
* wait until ``malloc()`` returns ``NULL`` when our TCP stack tries to allocate memory for a new connection
45+
* manually call ``tcp_kill_timewait()`` to forcibly stop the 'oldest' connection
46+
47+
This API frees up resources used by the connection. Consider using it instead of ``stop()`` if your application handles a lot of clients and frequently runs out of available heap memory.
48+
49+
*Example:*
50+
51+
.. code:: cpp
52+
# define MIN_HEAP_FREE 20000 // or whatever min available heap memory convienent for your application
53+
auto client = server.accept();
54+
// ... do something with the client object ...
55+
if (ESP.getFreeHeap() >= MIN_HEAP_FREE) {
56+
client.stop();
57+
} else {
58+
client.abort();
59+
}
60+
3261
setNoDelay
3362
~~~~~~~~~~
3463

libraries/ESP8266WiFi/src/WiFiClient.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,17 @@ uint16_t WiFiClient::localPort()
376376
return _client->getLocalPort();
377377
}
378378

379+
// Api for heap saving. Optional use instead of WiFiClient::stop to systematically retreive some heap memory
380+
// and avoiding server crashes in case of frequent clients connections.
381+
void WiFiClient::abort()
382+
{
383+
if (!_client)
384+
return;
385+
386+
flush(0); // Flush output buffer. Don't make any use of return boolean.
387+
_client->abort(); // Wich in turn calls tcp_abort which calls tcp_abandon().
388+
}
389+
379390
void WiFiClient::stopAll()
380391
{
381392
for (WiFiClient* it = _s_first; it; it = it->_next) {

libraries/ESP8266WiFi/src/WiFiClient.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class WiFiClient : public Client, public SList<WiFiClient> {
103103
friend class WiFiServer;
104104

105105
using Print::write;
106-
106+
107107
static void stopAll();
108108
static void stopAllExcept(WiFiClient * c);
109109

@@ -148,6 +148,10 @@ class WiFiClient : public Client, public SList<WiFiClient> {
148148
virtual bool outputCanTimeout () override { return connected(); }
149149
virtual bool inputCanTimeout () override { return connected(); }
150150

151+
// Immediately stops this client instance.
152+
// Unlike stop(), does not wait to gracefuly shutdown the connection.
153+
void abort();
154+
151155
protected:
152156

153157
static int8_t _s_connected(void* arg, void* tpcb, int8_t err);

0 commit comments

Comments
 (0)