mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-20 08:25:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'usb_memory_order_retry' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-25 14:39:38 -07:00
parent 6eb05eaabe 6cfca87ca7
commit d45b46341f
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
esphome/components/usb_uart/usb_uart.cpp
View File

@@ -174,6 +174,15 @@ void USBUartComponent::reset_input_state_(USBUartChannel *channel) {
channel->input_started_.store(false);
}
void USBUartComponent::restart_input_(USBUartChannel *channel) {
// Atomically check if still started and clear it before calling start_input
// This prevents race with concurrent restart attempts from different threads
bool expected = true;
if (channel->input_started_.compare_exchange_strong(expected, false)) {
this->start_input(channel);
}
}
void USBUartComponent::defer_input_retry_(USBUartChannel *channel) {
static constexpr uint8_t MAX_INPUT_RETRIES = 10;
@@ -186,11 +195,8 @@ void USBUartComponent::defer_input_retry_(USBUartChannel *channel) {
}
// Keep input_started_ as true during defer to prevent multiple retries from queueing
// The deferred lambda will clear it before calling start_input()
this->defer([this, channel] {
channel->input_started_.store(false);
this->start_input(channel);
});
// The deferred lambda will atomically restart
this->defer([this, channel] { this->restart_input_(channel); });
}
void USBUartComponent::setup() { USBClient::setup(); }
@@ -291,8 +297,7 @@ void USBUartComponent::start_input(USBUartChannel *channel) {
// On success, reset retry count and restart input immediately from USB task for performance
// The lock-free queue will handle backpressure
channel->input_retry_count_.store(0);
channel->input_started_.store(false);
this->start_input(channel);
this->restart_input_(channel);
};
// input_started_ already set to true by compare_exchange_strong above
auto result = this->transfer_in(ep->bEndpointAddress, callback, ep->wMaxPacketSize);

1
esphome/components/usb_uart/usb_uart.h
View File

@@ -143,6 +143,7 @@ class USBUartComponent : public usb_host::USBClient {
protected:
void defer_input_retry_(USBUartChannel *channel);
void reset_input_state_(USBUartChannel *channel);
void restart_input_(USBUartChannel *channel);
std::vector<USBUartChannel *> channels_{};
};