sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-23 12:13:49 +01:00
Code Issues Releases Wiki Activity

unique ptr

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-18 21:33:38 -10:00
parent dd25080550
commit f387d9ec50
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
esphome/components/script/script.h
View File

@@ -140,8 +140,10 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
void stop() override { void stop() override {
// Clear all queued items to free memory immediately // Clear all queued items to free memory immediately
for (int i = 0; i < this->max_runs_ - 1; i++) { if (this->var_queue_) {
this->var_queue_[i].reset(); for (int i = 0; i < this->max_runs_ - 1; i++) {
this->var_queue_[i].reset();
}
} }
this->num_queued_ = 0; this->num_queued_ = 0;
this->queue_front_ = 0; this->queue_front_ = 0;
@@ -164,13 +166,10 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
// Lazy init queue on first use - avoids setup() ordering issues and saves memory // Lazy init queue on first use - avoids setup() ordering issues and saves memory
// if script is never executed during this boot cycle // if script is never executed during this boot cycle
inline void lazy_init_queue_() { inline void lazy_init_queue_() {
if (this->var_queue_.capacity() == 0) { if (!this->var_queue_) {
// Allocate max_runs_ - 1 slots for queued items (running item is separate) // Allocate array of max_runs_ - 1 slots for queued items (running item is separate)
this->var_queue_.init(this->max_runs_ - 1); // unique_ptr array is zero-initialized, so all slots start as nullptr
// Initialize all unique_ptr slots to nullptr this->var_queue_ = std::make_unique<std::unique_ptr<std::tuple<Ts...>>[]>(this->max_runs_ - 1);
for (int i = 0; i < this->max_runs_ - 1; i++) {
this->var_queue_.push_back(nullptr);
}
} }
} }
@@ -181,7 +180,7 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
int num_queued_ = 0; // Number of queued instances (not including currently running) int num_queued_ = 0; // Number of queued instances (not including currently running)
int max_runs_ = 0; // Maximum total instances (running + queued) int max_runs_ = 0; // Maximum total instances (running + queued)
size_t queue_front_ = 0; // Ring buffer read position (next item to execute) size_t queue_front_ = 0; // Ring buffer read position (next item to execute)
FixedVector<std::unique_ptr<std::tuple<Ts...>>> var_queue_; // Ring buffer of queued parameters std::unique_ptr<std::unique_ptr<std::tuple<Ts...>>[]> var_queue_; // Ring buffer of queued parameters
}; };
/** A script type that executes new instances in parallel. /** A script type that executes new instances in parallel.