From 269124956a06f5c7ae121d092d70db6d136b5fa0 Mon Sep 17 00:00:00 2001 From: Mathieu Carbou Date: Sun, 15 Dec 2024 16:51:34 +0100 Subject: [PATCH] Applying clang formatting --- src/AsyncTCP.cpp | 12 ++++++------ src/AsyncTCP.h | 34 +++++++++++++++++----------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/AsyncTCP.cpp b/src/AsyncTCP.cpp index 722da63..12486a0 100644 --- a/src/AsyncTCP.cpp +++ b/src/AsyncTCP.cpp @@ -65,7 +65,7 @@ extern "C" { TCP poll interval is specified in terms of the TCP coarse timer interval, which is called twice a second https://github.com/espressif/esp-lwip/blob/2acf959a2bb559313cd2bf9306c24612ba3d0e19/src/core/tcp.c#L1895 */ -#define CONFIG_ASYNC_TCP_POLL_TIMER 1 +#define CONFIG_ASYNC_TCP_POLL_TIMER 1 /* * TCP/IP Event Task @@ -179,9 +179,9 @@ static inline bool _get_async_event(lwip_event_packet_t** e) { todo: implement some kind of fair dequeing or (better) simply punish user for a bad designed callbacks by resetting hog connections */ lwip_event_packet_t* next_pkt = NULL; - while (xQueuePeek(_async_queue, &next_pkt, 0) == pdPASS){ - if (next_pkt->arg == (*e)->arg && next_pkt->event == LWIP_TCP_POLL){ - if (xQueueReceive(_async_queue, &next_pkt, 0) == pdPASS){ + while (xQueuePeek(_async_queue, &next_pkt, 0) == pdPASS) { + if (next_pkt->arg == (*e)->arg && next_pkt->event == LWIP_TCP_POLL) { + if (xQueueReceive(_async_queue, &next_pkt, 0) == pdPASS) { free(next_pkt); next_pkt = NULL; log_d("coalescing polls, network congestion or async callbacks might be too slow!"); @@ -225,7 +225,7 @@ static bool _remove_events_with_arg(void* arg) { free(first_packet); first_packet = NULL; - // try to return first packet to the back of the queue + // try to return first packet to the back of the queue } else if (xQueueSend(_async_queue, &first_packet, 0) != pdPASS) { // we can't wait here if queue is full, because this call has been done from the only consumer task of this queue // otherwise it would deadlock, we have to discard the event @@ -374,7 +374,7 @@ static int8_t _tcp_connected(void* arg, tcp_pcb* pcb, int8_t err) { static int8_t _tcp_poll(void* arg, struct tcp_pcb* pcb) { // throttle polling events queing when event queue is getting filled up, let it handle _onack's - //log_d("qs:%u", uxQueueMessagesWaiting(_async_queue)); + // log_d("qs:%u", uxQueueMessagesWaiting(_async_queue)); if (uxQueueMessagesWaiting(_async_queue) > (rand() % CONFIG_ASYNC_TCP_QUEUE_SIZE / 2 + CONFIG_ASYNC_TCP_QUEUE_SIZE / 4)) { log_d("throttling"); return ERR_OK; diff --git a/src/AsyncTCP.h b/src/AsyncTCP.h index 17e3db9..ee81ff5 100644 --- a/src/AsyncTCP.h +++ b/src/AsyncTCP.h @@ -57,7 +57,7 @@ extern "C" { // guard AsyncTCP task with watchdog #ifndef CONFIG_ASYNC_TCP_USE_WDT - #define CONFIG_ASYNC_TCP_USE_WDT 1 + #define CONFIG_ASYNC_TCP_USE_WDT 1 #endif #ifndef CONFIG_ASYNC_TCP_STACK_SIZE @@ -111,12 +111,12 @@ class AsyncClient { bool connect(const char* host, uint16_t port); /** * @brief close connection - * + * * @param now - ignored */ void close(bool now = false); // same as close() - void stop(){ close(false); }; + void stop() { close(false); }; int8_t abort(); bool free(); @@ -134,17 +134,17 @@ class AsyncClient { it is enforced in https://github.com/espressif/esp-lwip/blob/0606eed9d8b98a797514fdf6eabb4daf1c8c8cd9/src/core/tcp_out.c#L422C5-L422C30 if LWIP_NETIF_TX_SINGLE_PBUF is set, and it is set indeed in IDF https://github.com/espressif/esp-idf/blob/a0f798cfc4bbd624aab52b2c194d219e242d80c1/components/lwip/port/include/lwipopts.h#L744 - * - * @param data - * @param size - * @param apiflags + * + * @param data + * @param size + * @param apiflags * @return size_t amount of data that has been copied */ size_t add(const char* data, size_t size, uint8_t apiflags = ASYNC_WRITE_FLAG_COPY); /** * @brief send data previously add()'ed - * + * * @return true on success * @return false on error */ @@ -154,22 +154,22 @@ class AsyncClient { * @brief add and enqueue data for sending * @note it is same as add() + send() * @note only make sense when canSend() == true - * - * @param data - * @param size - * @param apiflags - * @return size_t + * + * @param data + * @param size + * @param apiflags + * @return size_t */ size_t write(const char* data, size_t size, uint8_t apiflags = ASYNC_WRITE_FLAG_COPY); /** * @brief add and enque data for sending * @note treats data as null-terminated string - * - * @param data - * @return size_t + * + * @param data + * @return size_t */ - size_t write(const char* data){ return data == NULL ? 0 : write(data, strlen(data)); }; + size_t write(const char* data) { return data == NULL ? 0 : write(data, strlen(data)); }; uint8_t state(); bool connecting();