me-no-dev/ESPAsyncWebServer
1
0
Fork 1
mirror of https://github.com/me-no-dev/ESPAsyncWebServer.git synced 2025-09-28 15:21:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace use of LinkedList<T> with std::list for shared websocket buffers

Browse Source 
Based on commit bd4631bd5fa8989471684c7aab0228d4e05e9902 of dumbfixes
branch of 0xFEEDC0DE64 fork of ESPAsyncWebServer.

Step one of removal of homebrewed LinkedList in favor of standard C++
containers. Incidentally, this also fixes an analog of bug #837 where
removal of elements while iterating would invalidate the iterator and
lead to memory corruption.
This commit is contained in:
Alex Villacís Lasso
2020-12-29 12:56:39 -05:00
parent 600e1d123b
commit a20b7540ce
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/AsyncWebSocket.cpp
View File

@@ -934,7 +934,6 @@ AsyncWebSocket::AsyncWebSocket(const String& url)
,_clients(LinkedList<AsyncWebSocketClient *>([](AsyncWebSocketClient *c){ delete c; })) ,_clients(LinkedList<AsyncWebSocketClient *>([](AsyncWebSocketClient *c){ delete c; }))
,_cNextId(1) ,_cNextId(1)
,_enabled(true) ,_enabled(true)
,_buffers(LinkedList<AsyncWebSocketMessageBuffer *>([](AsyncWebSocketMessageBuffer *b){ delete b; }))
{ {
_eventHandler = NULL; _eventHandler = NULL;
} }
@@ -1300,22 +1299,23 @@ void AsyncWebSocket::handleRequest(AsyncWebServerRequest *request){
AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(size_t size) AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(size_t size)
{ {
AsyncWebSocketMessageBuffer * buffer = new AsyncWebSocketMessageBuffer(size); AsyncWebSocketMessageBuffer * buffer{};
if (buffer) { {
AsyncWebLockGuard l(_lock); AsyncWebLockGuard l(_lock);
_buffers.add(buffer); _buffers.emplace_back(size);
buffer = &_buffers.back();
} }
return buffer; return buffer;
} }
AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(uint8_t * data, size_t size) AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(uint8_t * data, size_t size)
{ {
AsyncWebSocketMessageBuffer * buffer = new AsyncWebSocketMessageBuffer(data, size); AsyncWebSocketMessageBuffer * buffer{};
if (buffer) { {
AsyncWebLockGuard l(_lock); AsyncWebLockGuard l(_lock);
// Serial.printf("Add to global buffers = %u\n", _buffers.length() + 1); _buffers.emplace_back(data, size);
_buffers.add(buffer); buffer = &_buffers.back();
} }
return buffer; return buffer;
@@ -1324,11 +1324,12 @@ AsyncWebSocketMessageBuffer * AsyncWebSocket::makeBuffer(uint8_t * data, size_t
void AsyncWebSocket::_cleanBuffers() void AsyncWebSocket::_cleanBuffers()
{ {
AsyncWebLockGuard l(_lock); AsyncWebLockGuard l(_lock);
for(AsyncWebSocketMessageBuffer * c: _buffers){
if(c && c->canDelete()){ for (auto iter = std::begin(_buffers); iter != std::end(_buffers);){
// Serial.printf("Remove from global buffers = %u\n", _buffers.length() - 1); if(iter->canDelete()){
_buffers.remove(c); iter = _buffers.erase(iter);
} } else
iter++;
} }
} }

4
src/AsyncWebSocket.h
View File

@@ -33,6 +33,8 @@
#include "AsyncWebSynchronization.h" #include "AsyncWebSynchronization.h"
#include <list>
#ifdef ESP8266 #ifdef ESP8266
#include <Hash.h> #include <Hash.h>
#ifdef CRYPTO_HASH_h // include Hash.h from espressif framework if the first include was from the crypto library #ifdef CRYPTO_HASH_h // include Hash.h from espressif framework if the first include was from the crypto library
@@ -337,7 +339,7 @@ class AsyncWebSocket: public AsyncWebHandler {
// messagebuffer functions/objects. // messagebuffer functions/objects.
AsyncWebSocketMessageBuffer * makeBuffer(size_t size = 0); AsyncWebSocketMessageBuffer * makeBuffer(size_t size = 0);
AsyncWebSocketMessageBuffer * makeBuffer(uint8_t * data, size_t size); AsyncWebSocketMessageBuffer * makeBuffer(uint8_t * data, size_t size);
LinkedList<AsyncWebSocketMessageBuffer *> _buffers; std::list<AsyncWebSocketMessageBuffer> _buffers;
void _cleanBuffers(); void _cleanBuffers();
AsyncWebSocketClientLinkedList getClients() const; AsyncWebSocketClientLinkedList getClients() const;