sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

merge

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-20 12:27:51 -10:00
parent 232d3a8b89
commit 82970b640f
1 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
esphome/core/scheduler.cpp
View File

@@ -541,22 +541,16 @@ 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);
<<<<<<< HEAD
#endif // ESPHOME_CORES_SINGLE
#ifdef ESPHOME_CORES_MULTI_NO_ATOMICS #elif defined(ESPHOME_CORES_MULTI_NO_ATOMICS)
======= // This is the multi core no atomics implementation.
//
#elif defined(ESPHOME_CORES_MULTI_NO_ATOMICS) // Without atomics, this implementation uses locks more aggressively:
>>>>>>> api_cleanups_2 // 1. Always locks when near the rollover boundary (within 10 seconds)
// This is the multi core no atomics implementation. // 2. Always locks when detecting a large backwards jump
// // 3. Updates without lock in normal forward progression (accepting minor races)
// Without atomics, this implementation uses locks more aggressively: // This is less efficient but necessary without atomic operations.
// 1. Always locks when near the rollover boundary (within 10 seconds) uint16_t major = this->millis_major_;
// 2. Always locks when detecting a large backwards jump
// 3. Updates without lock in normal forward progression (accepting minor races)
// This is less efficient but necessary without atomic operations.
uint16_t major = this->millis_major_;
uint32_t last = this->last_millis_; uint32_t last = this->last_millis_;
// Define a safe window around the rollover point (10 seconds) // Define a safe window around the rollover point (10 seconds)
@@ -596,23 +590,18 @@ 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);
<<<<<<< HEAD
#endif // ESPHOME_CORES_MULTI_NO_ATOMICS
#ifdef ESPHOME_CORES_MULTI_ATOMICS
=======
#elif defined(ESPHOME_CORES_MULTI_ATOMICS) #elif defined(ESPHOME_CORES_MULTI_ATOMICS)
>>>>>>> api_cleanups_2 // 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 // reads of millis_major_ and last_millis_ across cores. Features:
// reads of millis_major_ and last_millis_ across cores. Features: // 1. Epoch-coherency retry loop to handle concurrent updates
// 1. Epoch-coherency retry loop to handle concurrent updates // 2. Lock only taken for actual rollover detection and update
// 2. Lock only taken for actual rollover detection and update // 3. Lock-free CAS updates for normal forward time progression
// 3. Lock-free CAS updates for normal forward time progression // 4. Memory ordering ensures cores see consistent time values
// 4. Memory ordering ensures cores see consistent time values
for (;;) { for (;;) {
uint16_t major = this->millis_major_.load(std::memory_order_acquire); uint16_t major = this->millis_major_.load(std::memory_order_acquire);
/* /*
@@ -664,15 +653,11 @@ uint64_t Scheduler::millis_64_(uint32_t now) {
} }
// Unreachable - the loop always returns when major_end == major // Unreachable - the loop always returns when major_end == major
__builtin_unreachable(); __builtin_unreachable();
<<<<<<< HEAD
#endif // ESPHOME_CORES_MULTI_ATOMICS
=======
#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_CORES_SINGLE, ESPHOME_CORES_MULTI_NO_ATOMICS, or ESPHOME_CORES_MULTI_ATOMICS must be defined."
#endif #endif
>>>>>>> api_cleanups_2
} }
bool HOT Scheduler::SchedulerItem::cmp(const std::unique_ptr<SchedulerItem> &a, bool HOT Scheduler::SchedulerItem::cmp(const std::unique_ptr<SchedulerItem> &a,