github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-07-10 17:05:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into api/peel-first-write-iteration

Browse Source
This commit is contained in:
J. Nick Koston
2026-04-01 16:34:53 -10:00
committed by GitHub
parent 7954a770bd f36d78e09c
commit 0df38cc62a
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/core/component.cpp
-10
View File
@@ -267,9 +267,6 @@ void Component::call() {
break;
}
}
const LogString *Component::get_component_log_str() const {
return component_source_lookup(this->component_source_index_);
}
bool Component::should_warn_of_blocking(uint32_t blocking_time) {
// Convert centisecond threshold to milliseconds for comparison
uint32_t threshold_ms = static_cast<uint32_t>(this->warn_if_blocking_over_) * 10U;
@@ -519,13 +516,6 @@ WarnIfComponentBlockingGuard::warn_blocking(Component *component, uint32_t block
}
}
#ifdef USE_RUNTIME_STATS
void WarnIfComponentBlockingGuard::record_runtime_stats_() {
uint32_t duration_us = micros() - this->started_us_;
this->component_->runtime_stats_.record_time(duration_us);
}
#endif
#ifdef USE_SETUP_PRIORITY_OVERRIDE
void clear_setup_priority_overrides() {
// Free the setup priority map completely
esphome/core/component.h
+7 -6
View File
@@ -323,7 +323,9 @@ class Component {
*
* Returns LOG_STR("<unknown>") if source not set
*/
const LogString *get_component_log_str() const;
inline const LogString *get_component_log_str() const ESPHOME_ALWAYS_INLINE {
return component_source_lookup(this->component_source_index_);
}
bool should_warn_of_blocking(uint32_t blocking_time);
@@ -630,17 +632,17 @@ class WarnIfComponentBlockingGuard {
{
}
// Finish the timing operation and return the current time
// Finish the timing operation and return the current time (millis)
// Inlined: the fast path is just millis() + subtract + compare
inline uint32_t HOT finish() {
uint32_t curr_time = millis();
uint32_t blocking_time = curr_time - this->started_;
#ifdef USE_RUNTIME_STATS
this->record_runtime_stats_();
this->component_->runtime_stats_.record_time(micros() - this->started_us_);
#endif
uint32_t curr_time = millis();
#ifndef USE_BENCHMARK
// Fast path: compare against constant threshold in ms (computed at compile time from centiseconds)
static constexpr uint32_t WARN_IF_BLOCKING_OVER_MS = static_cast<uint32_t>(WARN_IF_BLOCKING_OVER_CS) * 10U;
uint32_t blocking_time = curr_time - this->started_;
if (blocking_time > WARN_IF_BLOCKING_OVER_MS) [[unlikely]] {
warn_blocking(this->component_, blocking_time);
}
@@ -655,7 +657,6 @@ class WarnIfComponentBlockingGuard {
Component *component_;
#ifdef USE_RUNTIME_STATS
uint32_t started_us_;
void record_runtime_stats_();
#endif
private: