jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-07-29 14:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[core] Revert #9851 and rename ESPHOME_CORES to ESPHOME_THREAD (#9862)

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-24 01:04:00 -10:00 committed by GitHub
parent 5bff9bc8d9
commit 1344103086
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 44 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
esphome/components/esp32/__init__.py
View File

@ -31,7 +31,7 @@ from esphome.const import (
KEY_TARGET_FRAMEWORK, KEY_TARGET_FRAMEWORK,
KEY_TARGET_PLATFORM, KEY_TARGET_PLATFORM,
PLATFORM_ESP32, PLATFORM_ESP32,
CoreModel, ThreadModel,
__version__, __version__,
) )
from esphome.core import CORE, HexInt, TimePeriod from esphome.core import CORE, HexInt, TimePeriod
@ -98,16 +98,6 @@ ARDUINO_ALLOWED_VARIANTS = [
VARIANT_ESP32S3, VARIANT_ESP32S3,
] ]
# Single-core ESP32 variants
SINGLE_CORE_VARIANTS = frozenset(
[
VARIANT_ESP32S2,
VARIANT_ESP32C3,
VARIANT_ESP32C6,
VARIANT_ESP32H2,
]
)
def get_cpu_frequencies(*frequencies): def get_cpu_frequencies(*frequencies):
return [str(x) + "MHZ" for x in frequencies] return [str(x) + "MHZ" for x in frequencies]
@ -724,11 +714,7 @@ async def to_code(config):
cg.add_define("ESPHOME_BOARD", config[CONF_BOARD]) cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
cg.add_build_flag(f"-DUSE_ESP32_VARIANT_{config[CONF_VARIANT]}") cg.add_build_flag(f"-DUSE_ESP32_VARIANT_{config[CONF_VARIANT]}")
cg.add_define("ESPHOME_VARIANT", VARIANT_FRIENDLY[config[CONF_VARIANT]]) cg.add_define("ESPHOME_VARIANT", VARIANT_FRIENDLY[config[CONF_VARIANT]])
# Set threading model based on core count cg.add_define(ThreadModel.MULTI_ATOMICS)
if config[CONF_VARIANT] in SINGLE_CORE_VARIANTS:
cg.add_define(CoreModel.SINGLE)
else:
cg.add_define(CoreModel.MULTI_ATOMICS)
cg.add_platformio_option("lib_ldf_mode", "off") cg.add_platformio_option("lib_ldf_mode", "off")
cg.add_platformio_option("lib_compat_mode", "strict") cg.add_platformio_option("lib_compat_mode", "strict")

4
esphome/components/esp8266/__init__.py
View File

@ -15,7 +15,7 @@ from esphome.const import (
KEY_TARGET_FRAMEWORK, KEY_TARGET_FRAMEWORK,
KEY_TARGET_PLATFORM, KEY_TARGET_PLATFORM,
PLATFORM_ESP8266, PLATFORM_ESP8266,
CoreModel, ThreadModel,
) )
from esphome.core import CORE, coroutine_with_priority from esphome.core import CORE, coroutine_with_priority
from esphome.helpers import copy_file_if_changed from esphome.helpers import copy_file_if_changed
@ -188,7 +188,7 @@ async def to_code(config):
cg.set_cpp_standard("gnu++20") cg.set_cpp_standard("gnu++20")
cg.add_define("ESPHOME_BOARD", config[CONF_BOARD]) cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
cg.add_define("ESPHOME_VARIANT", "ESP8266") cg.add_define("ESPHOME_VARIANT", "ESP8266")
cg.add_define(CoreModel.SINGLE) cg.add_define(ThreadModel.SINGLE)
cg.add_platformio_option("extra_scripts", ["post:post_build.py"]) cg.add_platformio_option("extra_scripts", ["post:post_build.py"])

4
esphome/components/host/__init__.py
View File

@ -7,7 +7,7 @@ from esphome.const import (
KEY_TARGET_FRAMEWORK, KEY_TARGET_FRAMEWORK,
KEY_TARGET_PLATFORM, KEY_TARGET_PLATFORM,
PLATFORM_HOST, PLATFORM_HOST,
CoreModel, ThreadModel,
) )
from esphome.core import CORE from esphome.core import CORE
@ -44,7 +44,7 @@ async def to_code(config):
cg.add_define("USE_ESPHOME_HOST_MAC_ADDRESS", config[CONF_MAC_ADDRESS].parts) cg.add_define("USE_ESPHOME_HOST_MAC_ADDRESS", config[CONF_MAC_ADDRESS].parts)
cg.add_build_flag("-std=gnu++20") cg.add_build_flag("-std=gnu++20")
cg.add_define("ESPHOME_BOARD", "host") cg.add_define("ESPHOME_BOARD", "host")
cg.add_define(CoreModel.MULTI_ATOMICS) cg.add_define(ThreadModel.MULTI_ATOMICS)
cg.add_platformio_option("platform", "platformio/native") cg.add_platformio_option("platform", "platformio/native")
cg.add_platformio_option("lib_ldf_mode", "off") cg.add_platformio_option("lib_ldf_mode", "off")
cg.add_platformio_option("lib_compat_mode", "strict") cg.add_platformio_option("lib_compat_mode", "strict")

4
esphome/components/libretiny/__init__.py
View File

@ -20,7 +20,7 @@ from esphome.const import (
KEY_FRAMEWORK_VERSION, KEY_FRAMEWORK_VERSION,
KEY_TARGET_FRAMEWORK, KEY_TARGET_FRAMEWORK,
KEY_TARGET_PLATFORM, KEY_TARGET_PLATFORM,
CoreModel, ThreadModel,
__version__, __version__,
) )
from esphome.core import CORE from esphome.core import CORE
@ -261,7 +261,7 @@ async def component_to_code(config):
cg.add_build_flag(f"-DUSE_LIBRETINY_VARIANT_{config[CONF_FAMILY]}") cg.add_build_flag(f"-DUSE_LIBRETINY_VARIANT_{config[CONF_FAMILY]}")
cg.add_define("ESPHOME_BOARD", config[CONF_BOARD]) cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
cg.add_define("ESPHOME_VARIANT", FAMILY_FRIENDLY[config[CONF_FAMILY]]) cg.add_define("ESPHOME_VARIANT", FAMILY_FRIENDLY[config[CONF_FAMILY]])
cg.add_define(CoreModel.MULTI_NO_ATOMICS) cg.add_define(ThreadModel.MULTI_NO_ATOMICS)
# force using arduino framework # force using arduino framework
cg.add_platformio_option("framework", "arduino") cg.add_platformio_option("framework", "arduino")

4
esphome/components/nrf52/__init__.py
View File

@ -23,7 +23,7 @@ from esphome.const import (
KEY_TARGET_FRAMEWORK, KEY_TARGET_FRAMEWORK,
KEY_TARGET_PLATFORM, KEY_TARGET_PLATFORM,
PLATFORM_NRF52, PLATFORM_NRF52,
CoreModel, ThreadModel,
) )
from esphome.core import CORE, EsphomeError, coroutine_with_priority from esphome.core import CORE, EsphomeError, coroutine_with_priority
from esphome.storage_json import StorageJSON from esphome.storage_json import StorageJSON
@ -110,7 +110,7 @@ async def to_code(config: ConfigType) -> None:
cg.add_define("ESPHOME_BOARD", config[CONF_BOARD]) cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
cg.add_define("ESPHOME_VARIANT", "NRF52") cg.add_define("ESPHOME_VARIANT", "NRF52")
# nRF52 processors are single-core # nRF52 processors are single-core
cg.add_define(CoreModel.SINGLE) cg.add_define(ThreadModel.SINGLE)
cg.add_platformio_option(CONF_FRAMEWORK, CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK]) cg.add_platformio_option(CONF_FRAMEWORK, CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK])
cg.add_platformio_option( cg.add_platformio_option(
"platform", "platform",

4
esphome/components/rp2040/__init__.py
View File

@ -16,7 +16,7 @@ from esphome.const import (
KEY_TARGET_FRAMEWORK, KEY_TARGET_FRAMEWORK,
KEY_TARGET_PLATFORM, KEY_TARGET_PLATFORM,
PLATFORM_RP2040, PLATFORM_RP2040,
CoreModel, ThreadModel,
) )
from esphome.core import CORE, EsphomeError, coroutine_with_priority from esphome.core import CORE, EsphomeError, coroutine_with_priority
from esphome.helpers import copy_file_if_changed, mkdir_p, read_file, write_file from esphome.helpers import copy_file_if_changed, mkdir_p, read_file, write_file
@ -172,7 +172,7 @@ async def to_code(config):
cg.set_cpp_standard("gnu++20") cg.set_cpp_standard("gnu++20")
cg.add_define("ESPHOME_BOARD", config[CONF_BOARD]) cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
cg.add_define("ESPHOME_VARIANT", "RP2040") cg.add_define("ESPHOME_VARIANT", "RP2040")
cg.add_define(CoreModel.SINGLE) cg.add_define(ThreadModel.SINGLE)
cg.add_platformio_option("extra_scripts", ["post:post_build.py"]) cg.add_platformio_option("extra_scripts", ["post:post_build.py"])

10
esphome/const.py
View File

@ -35,12 +35,12 @@ class Framework(StrEnum):
ZEPHYR = "zephyr" ZEPHYR = "zephyr"
class CoreModel(StrEnum): class ThreadModel(StrEnum):
"""Core model identifiers for ESPHome scheduler.""" """Threading model identifiers for ESPHome scheduler."""
SINGLE = "ESPHOME_CORES_SINGLE" SINGLE = "ESPHOME_THREAD_SINGLE"
MULTI_NO_ATOMICS = "ESPHOME_CORES_MULTI_NO_ATOMICS" MULTI_NO_ATOMICS = "ESPHOME_THREAD_MULTI_NO_ATOMICS"
MULTI_ATOMICS = "ESPHOME_CORES_MULTI_ATOMICS" MULTI_ATOMICS = "ESPHOME_THREAD_MULTI_ATOMICS"
class PlatformFramework(Enum): class PlatformFramework(Enum):

4
esphome/core/defines.h
View File

@ -15,8 +15,8 @@
#define ESPHOME_VARIANT "ESP32" #define ESPHOME_VARIANT "ESP32"
#define ESPHOME_DEBUG_SCHEDULER #define ESPHOME_DEBUG_SCHEDULER
// Default threading model for static analysis (ESP32 is multi-core with atomics) // Default threading model for static analysis (ESP32 is multi-threaded with atomics)
#define ESPHOME_CORES_MULTI_ATOMICS #define ESPHOME_THREAD_MULTI_ATOMICS
// logger // logger
#define ESPHOME_LOG_LEVEL ESPHOME_LOG_LEVEL_VERY_VERBOSE #define ESPHOME_LOG_LEVEL ESPHOME_LOG_LEVEL_VERY_VERBOSE

32
esphome/core/scheduler.cpp
View File

@ -84,7 +84,7 @@ void HOT Scheduler::set_timer_common_(Component *component, SchedulerItem::Type
item->callback = std::move(func); item->callback = std::move(func);
item->remove = false; item->remove = false;
#ifndef ESPHOME_CORES_SINGLE #ifndef ESPHOME_THREAD_SINGLE
// Special handling for defer() (delay = 0, type = TIMEOUT) // Special handling for defer() (delay = 0, type = TIMEOUT)
// Single-core platforms don't need thread-safe defer handling // Single-core platforms don't need thread-safe defer handling
if (delay == 0 && type == SchedulerItem::TIMEOUT) { if (delay == 0 && type == SchedulerItem::TIMEOUT) {
@ -94,7 +94,7 @@ void HOT Scheduler::set_timer_common_(Component *component, SchedulerItem::Type
this->defer_queue_.push_back(std::move(item)); this->defer_queue_.push_back(std::move(item));
return; return;
} }
#endif /* not ESPHOME_CORES_SINGLE */ #endif /* not ESPHOME_THREAD_SINGLE */
// Get fresh timestamp for new timer/interval - ensures accurate scheduling // Get fresh timestamp for new timer/interval - ensures accurate scheduling
const auto now = this->millis_64_(millis()); // Fresh millis() call const auto now = this->millis_64_(millis()); // Fresh millis() call
@ -238,7 +238,7 @@ optional<uint32_t> HOT Scheduler::next_schedule_in(uint32_t now) {
return item->next_execution_ - now_64; return item->next_execution_ - now_64;
} }
void HOT Scheduler::call(uint32_t now) { void HOT Scheduler::call(uint32_t now) {
#ifndef ESPHOME_CORES_SINGLE #ifndef ESPHOME_THREAD_SINGLE
// Process defer queue first to guarantee FIFO execution order for deferred items. // Process defer queue first to guarantee FIFO execution order for deferred items.
// Previously, defer() used the heap which gave undefined order for equal timestamps, // Previously, defer() used the heap which gave undefined order for equal timestamps,
// causing race conditions on multi-core systems (ESP32, BK7200). // causing race conditions on multi-core systems (ESP32, BK7200).
@ -268,7 +268,7 @@ void HOT Scheduler::call(uint32_t now) {
this->execute_item_(item.get(), now); this->execute_item_(item.get(), now);
} }
} }
#endif /* not ESPHOME_CORES_SINGLE */ #endif /* not ESPHOME_THREAD_SINGLE */
// Convert the fresh timestamp from main loop to 64-bit for scheduler operations // Convert the fresh timestamp from main loop to 64-bit for scheduler operations
const auto now_64 = this->millis_64_(now); // 'now' from parameter - fresh from Application::loop() const auto now_64 = this->millis_64_(now); // 'now' from parameter - fresh from Application::loop()
@ -280,15 +280,15 @@ void HOT Scheduler::call(uint32_t now) {
if (now_64 - last_print > 2000) { if (now_64 - last_print > 2000) {
last_print = now_64; last_print = now_64;
std::vector<std::unique_ptr<SchedulerItem>> old_items; std::vector<std::unique_ptr<SchedulerItem>> old_items;
#ifdef ESPHOME_CORES_MULTI_ATOMICS #ifdef ESPHOME_THREAD_MULTI_ATOMICS
const auto last_dbg = this->last_millis_.load(std::memory_order_relaxed); const auto last_dbg = this->last_millis_.load(std::memory_order_relaxed);
const auto major_dbg = this->millis_major_.load(std::memory_order_relaxed); const auto major_dbg = this->millis_major_.load(std::memory_order_relaxed);
ESP_LOGD(TAG, "Items: count=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(), now_64, ESP_LOGD(TAG, "Items: count=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(), now_64,
major_dbg, last_dbg); major_dbg, last_dbg);
#else /* not ESPHOME_CORES_MULTI_ATOMICS */ #else /* not ESPHOME_THREAD_MULTI_ATOMICS */
ESP_LOGD(TAG, "Items: count=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(), now_64, ESP_LOGD(TAG, "Items: count=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(), now_64,
this->millis_major_, this->last_millis_); this->millis_major_, this->last_millis_);
#endif /* else ESPHOME_CORES_MULTI_ATOMICS */ #endif /* else ESPHOME_THREAD_MULTI_ATOMICS */
// Cleanup before debug output // Cleanup before debug output
this->cleanup_(); this->cleanup_();
while (!this->items_.empty()) { while (!this->items_.empty()) {
@ -473,7 +473,7 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name_c
size_t total_cancelled = 0; size_t total_cancelled = 0;
// Check all containers for matching items // Check all containers for matching items
#ifndef ESPHOME_CORES_SINGLE #ifndef ESPHOME_THREAD_SINGLE
// Only check defer queue for timeouts (intervals never go there) // Only check defer queue for timeouts (intervals never go there)
if (type == SchedulerItem::TIMEOUT) { if (type == SchedulerItem::TIMEOUT) {
for (auto &item : this->defer_queue_) { for (auto &item : this->defer_queue_) {
@ -483,7 +483,7 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name_c
} }
} }
} }
#endif /* not ESPHOME_CORES_SINGLE */ #endif /* not ESPHOME_THREAD_SINGLE */
// Cancel items in the main heap // Cancel items in the main heap
for (auto &item : this->items_) { for (auto &item : this->items_) {
@ -509,9 +509,9 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, const char *name_c
uint64_t Scheduler::millis_64_(uint32_t now) { uint64_t Scheduler::millis_64_(uint32_t now) {
// THREAD SAFETY NOTE: // THREAD SAFETY NOTE:
// This function has three implementations, based on the precompiler flags // This function has three implementations, based on the precompiler flags
// - ESPHOME_CORES_SINGLE - Runs on single-core platforms (ESP8266, RP2040, etc.) // - ESPHOME_THREAD_SINGLE - Runs on single-threaded platforms (ESP8266, RP2040, etc.)
// - ESPHOME_CORES_MULTI_NO_ATOMICS - Runs on multi-core platforms without atomics (LibreTiny) // - ESPHOME_THREAD_MULTI_NO_ATOMICS - Runs on multi-threaded platforms without atomics (LibreTiny)
// - ESPHOME_CORES_MULTI_ATOMICS - Runs on multi-core platforms with atomics (ESP32, HOST, etc.) // - ESPHOME_THREAD_MULTI_ATOMICS - Runs on multi-threaded platforms with atomics (ESP32, HOST, etc.)
// //
// Make sure all changes are synchronized if you edit this function. // Make sure all changes are synchronized if you edit this function.
// //
@ -520,7 +520,7 @@ uint64_t Scheduler::millis_64_(uint32_t now) {
// helps maintain accuracy. // helps maintain accuracy.
// //
#ifdef ESPHOME_CORES_SINGLE #ifdef ESPHOME_THREAD_SINGLE
// This is the single core implementation. // This is the single core implementation.
// //
// Single-core platforms have no concurrency, so this is a simple implementation // Single-core platforms have no concurrency, so this is a simple implementation
@ -546,7 +546,7 @@ uint64_t Scheduler::millis_64_(uint32_t now) {
// Combine major (high 32 bits) and now (low 32 bits) into 64-bit time // Combine major (high 32 bits) and now (low 32 bits) into 64-bit time
return now + (static_cast<uint64_t>(major) << 32); return now + (static_cast<uint64_t>(major) << 32);
#elif defined(ESPHOME_CORES_MULTI_NO_ATOMICS) #elif defined(ESPHOME_THREAD_MULTI_NO_ATOMICS)
// This is the multi core no atomics implementation. // This is the multi core no atomics implementation.
// //
// Without atomics, this implementation uses locks more aggressively: // Without atomics, this implementation uses locks more aggressively:
@ -595,7 +595,7 @@ uint64_t Scheduler::millis_64_(uint32_t now) {
// Combine major (high 32 bits) and now (low 32 bits) into 64-bit time // Combine major (high 32 bits) and now (low 32 bits) into 64-bit time
return now + (static_cast<uint64_t>(major) << 32); return now + (static_cast<uint64_t>(major) << 32);
#elif defined(ESPHOME_CORES_MULTI_ATOMICS) #elif defined(ESPHOME_THREAD_MULTI_ATOMICS)
// This is the multi core with atomics implementation. // This is the multi core with atomics implementation.
// //
// Uses atomic operations with acquire/release semantics to ensure coherent // Uses atomic operations with acquire/release semantics to ensure coherent
@ -660,7 +660,7 @@ uint64_t Scheduler::millis_64_(uint32_t now) {
#else #else
#error \ #error \
"No platform threading model defined. One of ESPHOME_CORES_SINGLE, ESPHOME_CORES_MULTI_NO_ATOMICS, or ESPHOME_CORES_MULTI_ATOMICS must be defined." "No platform threading model defined. One of ESPHOME_THREAD_SINGLE, ESPHOME_THREAD_MULTI_NO_ATOMICS, or ESPHOME_THREAD_MULTI_ATOMICS must be defined."
#endif #endif
} }

18
esphome/core/scheduler.h
View File

@ -5,7 +5,7 @@
#include <memory> #include <memory>
#include <cstring> #include <cstring>
#include <deque> #include <deque>
#ifdef ESPHOME_CORES_MULTI_ATOMICS #ifdef ESPHOME_THREAD_MULTI_ATOMICS
#include <atomic> #include <atomic>
#endif #endif
@ -200,13 +200,13 @@ class Scheduler {
Mutex lock_; Mutex lock_;
std::vector<std::unique_ptr<SchedulerItem>> items_; std::vector<std::unique_ptr<SchedulerItem>> items_;
std::vector<std::unique_ptr<SchedulerItem>> to_add_; std::vector<std::unique_ptr<SchedulerItem>> to_add_;
#ifndef ESPHOME_CORES_SINGLE #ifndef ESPHOME_THREAD_SINGLE
// Single-core platforms don't need the defer queue and save 40 bytes of RAM // Single-core platforms don't need the defer queue and save 40 bytes of RAM
std::deque<std::unique_ptr<SchedulerItem>> defer_queue_; // FIFO queue for defer() calls std::deque<std::unique_ptr<SchedulerItem>> defer_queue_; // FIFO queue for defer() calls
#endif /* ESPHOME_CORES_SINGLE */ #endif /* ESPHOME_THREAD_SINGLE */
uint32_t to_remove_{0}; uint32_t to_remove_{0};
#ifdef ESPHOME_CORES_MULTI_ATOMICS #ifdef ESPHOME_THREAD_MULTI_ATOMICS
/* /*
* Multi-threaded platforms with atomic support: last_millis_ needs atomic for lock-free updates * Multi-threaded platforms with atomic support: last_millis_ needs atomic for lock-free updates
* *
@ -218,10 +218,10 @@ class Scheduler {
* it also observes the corresponding increment of `millis_major_`. * it also observes the corresponding increment of `millis_major_`.
*/ */
std::atomic<uint32_t> last_millis_{0}; std::atomic<uint32_t> last_millis_{0};
#else /* not ESPHOME_CORES_MULTI_ATOMICS */ #else /* not ESPHOME_THREAD_MULTI_ATOMICS */
// Platforms without atomic support or single-threaded platforms // Platforms without atomic support or single-threaded platforms
uint32_t last_millis_{0}; uint32_t last_millis_{0};
#endif /* else ESPHOME_CORES_MULTI_ATOMICS */ #endif /* else ESPHOME_THREAD_MULTI_ATOMICS */
/* /*
* Upper 16 bits of the 64-bit millis counter. Incremented only while holding * Upper 16 bits of the 64-bit millis counter. Incremented only while holding
@ -229,11 +229,11 @@ class Scheduler {
* Ordering relative to `last_millis_` is provided by its release store and the * Ordering relative to `last_millis_` is provided by its release store and the
* corresponding acquire loads. * corresponding acquire loads.
*/ */
#ifdef ESPHOME_CORES_MULTI_ATOMICS #ifdef ESPHOME_THREAD_MULTI_ATOMICS
std::atomic<uint16_t> millis_major_{0}; std::atomic<uint16_t> millis_major_{0};
#else /* not ESPHOME_CORES_MULTI_ATOMICS */ #else /* not ESPHOME_THREAD_MULTI_ATOMICS */
uint16_t millis_major_{0}; uint16_t millis_major_{0};
#endif /* else ESPHOME_CORES_MULTI_ATOMICS */ #endif /* else ESPHOME_THREAD_MULTI_ATOMICS */
}; };
} // namespace esphome } // namespace esphome