mirror of
https://github.com/esphome/esphome.git
synced 2026-05-30 15:28:34 +08:00
[core] Dedupe yield() fast path in wakeable_delay and always-inline (#15915)
CI for docker images / Build docker containers (docker, ubuntu-24.04) (push) Has been cancelled
CI for docker images / Build docker containers (docker, ubuntu-24.04-arm) (push) Has been cancelled
CI for docker images / Build docker containers (ha-addon, ubuntu-24.04) (push) Has been cancelled
CI for docker images / Build docker containers (ha-addon, ubuntu-24.04-arm) (push) Has been cancelled
CI / Create common environment (push) Has been cancelled
CI / Check pylint (push) Has been cancelled
CI / Run script/ci-custom (push) Has been cancelled
CI / Run pytest (macOS-latest, 3.11) (push) Has been cancelled
CI / Run pytest (macOS-latest, 3.14) (push) Has been cancelled
CI / Run pytest (ubuntu-latest, 3.11) (push) Has been cancelled
CI / Run pytest (ubuntu-latest, 3.13) (push) Has been cancelled
CI / Run pytest (ubuntu-latest, 3.14) (push) Has been cancelled
CI / Run pytest (windows-latest, 3.11) (push) Has been cancelled
CI / Run pytest (windows-latest, 3.14) (push) Has been cancelled
CI / Determine which jobs to run (push) Has been cancelled
CI / Run integration tests (push) Has been cancelled
CI / Run C++ unit tests (push) Has been cancelled
CI / Run CodSpeed benchmarks (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 IDF (push) Has been cancelled
CI / Run script/clang-tidy for ESP8266 (push) Has been cancelled
CI / Run script/clang-tidy for ZEPHYR (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino 1/4 (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino 2/4 (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino 3/4 (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino 4/4 (push) Has been cancelled
CI / Test components batch (${{ matrix.components }}) (push) Has been cancelled
CI / pre-commit.ci lite (push) Has been cancelled
CI / Build target branch for memory impact (push) Has been cancelled
CI / Build PR branch for memory impact (push) Has been cancelled
CI / Comment memory impact (push) Has been cancelled
CI / CI Status (push) Has been cancelled
CI for docker images / Build docker containers (docker, ubuntu-24.04) (push) Has been cancelled
CI for docker images / Build docker containers (docker, ubuntu-24.04-arm) (push) Has been cancelled
CI for docker images / Build docker containers (ha-addon, ubuntu-24.04) (push) Has been cancelled
CI for docker images / Build docker containers (ha-addon, ubuntu-24.04-arm) (push) Has been cancelled
CI / Create common environment (push) Has been cancelled
CI / Check pylint (push) Has been cancelled
CI / Run script/ci-custom (push) Has been cancelled
CI / Run pytest (macOS-latest, 3.11) (push) Has been cancelled
CI / Run pytest (macOS-latest, 3.14) (push) Has been cancelled
CI / Run pytest (ubuntu-latest, 3.11) (push) Has been cancelled
CI / Run pytest (ubuntu-latest, 3.13) (push) Has been cancelled
CI / Run pytest (ubuntu-latest, 3.14) (push) Has been cancelled
CI / Run pytest (windows-latest, 3.11) (push) Has been cancelled
CI / Run pytest (windows-latest, 3.14) (push) Has been cancelled
CI / Determine which jobs to run (push) Has been cancelled
CI / Run integration tests (push) Has been cancelled
CI / Run C++ unit tests (push) Has been cancelled
CI / Run CodSpeed benchmarks (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 IDF (push) Has been cancelled
CI / Run script/clang-tidy for ESP8266 (push) Has been cancelled
CI / Run script/clang-tidy for ZEPHYR (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino 1/4 (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino 2/4 (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino 3/4 (push) Has been cancelled
CI / Run script/clang-tidy for ESP32 Arduino 4/4 (push) Has been cancelled
CI / Test components batch (${{ matrix.components }}) (push) Has been cancelled
CI / pre-commit.ci lite (push) Has been cancelled
CI / Build target branch for memory impact (push) Has been cancelled
CI / Build PR branch for memory impact (push) Has been cancelled
CI / Comment memory impact (push) Has been cancelled
CI / CI Status (push) Has been cancelled
This commit is contained in:
@@ -748,18 +748,6 @@ inline void ESPHOME_ALWAYS_INLINE Application::loop() {
|
|||||||
// Inline yield_with_select_ for all paths except the select() fallback
|
// Inline yield_with_select_ for all paths except the select() fallback
|
||||||
#ifndef USE_HOST
|
#ifndef USE_HOST
|
||||||
inline void ESPHOME_ALWAYS_INLINE Application::yield_with_select_(uint32_t delay_ms) {
|
inline void ESPHOME_ALWAYS_INLINE Application::yield_with_select_(uint32_t delay_ms) {
|
||||||
#ifdef USE_LWIP_FAST_SELECT
|
|
||||||
// Fast path (ESP32/LibreTiny): FreeRTOS task notifications posted by the lwip
|
|
||||||
// event_callback wrapper (see lwip_fast_select.c) are the single source of truth for
|
|
||||||
// socket wake-ups. Every NETCONN_EVT_RCVPLUS posts an xTaskNotifyGive, so any notification
|
|
||||||
// that lands between wakes keeps the counter non-zero (next ulTaskNotifyTake returns
|
|
||||||
// immediately) or wakes a blocked Take directly. Additional wake sources:
|
|
||||||
// wake_loop_threadsafe() from background tasks, and the delay_ms timeout.
|
|
||||||
if (delay_ms == 0) [[unlikely]] {
|
|
||||||
yield();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
esphome::internal::wakeable_delay(delay_ms);
|
esphome::internal::wakeable_delay(delay_ms);
|
||||||
}
|
}
|
||||||
#endif // !USE_HOST
|
#endif // !USE_HOST
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ static int64_t alarm_callback_(alarm_id_t id, void *user_data) {
|
|||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
void wakeable_delay(uint32_t ms) {
|
void wakeable_delay(uint32_t ms) {
|
||||||
if (ms == 0) {
|
if (ms == 0) [[unlikely]] {
|
||||||
yield();
|
yield();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-6
@@ -96,8 +96,14 @@ inline void wake_loop_threadsafe() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
inline void wakeable_delay(uint32_t ms) {
|
inline void ESPHOME_ALWAYS_INLINE wakeable_delay(uint32_t ms) {
|
||||||
if (ms == 0) {
|
// Fast path (with USE_LWIP_FAST_SELECT): FreeRTOS task notifications posted by the lwip
|
||||||
|
// event_callback wrapper (see lwip_fast_select.c) are the single source of truth for
|
||||||
|
// socket wake-ups. Every NETCONN_EVT_RCVPLUS posts an xTaskNotifyGive, so any notification
|
||||||
|
// that lands between wakes keeps the counter non-zero (next ulTaskNotifyTake returns
|
||||||
|
// immediately) or wakes a blocked Take directly. Additional wake sources:
|
||||||
|
// wake_loop_threadsafe() from background tasks, and the ms timeout.
|
||||||
|
if (ms == 0) [[unlikely]] {
|
||||||
yield();
|
yield();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -127,8 +133,8 @@ inline void wake_loop_threadsafe() { wake_loop_impl(); }
|
|||||||
inline void ESPHOME_ALWAYS_INLINE wake_loop_isrsafe() { wake_loop_impl(); }
|
inline void ESPHOME_ALWAYS_INLINE wake_loop_isrsafe() { wake_loop_impl(); }
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
inline void wakeable_delay(uint32_t ms) {
|
inline void ESPHOME_ALWAYS_INLINE wakeable_delay(uint32_t ms) {
|
||||||
if (ms == 0) {
|
if (ms == 0) [[unlikely]] {
|
||||||
delay(0);
|
delay(0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -174,8 +180,8 @@ inline void wake_loop_threadsafe() {}
|
|||||||
inline void wake_loop_any_context() { wake_loop_threadsafe(); }
|
inline void wake_loop_any_context() { wake_loop_threadsafe(); }
|
||||||
|
|
||||||
namespace internal {
|
namespace internal {
|
||||||
inline void wakeable_delay(uint32_t ms) {
|
inline void ESPHOME_ALWAYS_INLINE wakeable_delay(uint32_t ms) {
|
||||||
if (ms == 0) {
|
if (ms == 0) [[unlikely]] {
|
||||||
yield();
|
yield();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user