aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2026-10-31 22:02:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: refuse a radio job when its outcomes might not fit in the event ring

Browse source 
A full event ring threw an outcome away, breaking the rule that every job
we submit ends with exactly one of finished, aborted or dropped.  A lost
outcome left a favorite uncommitted and a held shade waiting out its 30s
timeout.  submit() and hasRoom() now keep room for two outcomes of every
job not yet ended, so an event can't be lost; if loop() stops collecting
them, new jobs are refused instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
cjkas 2026-10-13 15:05:06 +02:00
parent b768c5f987
commit f0e8b1d896
3 changed files with 68 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

50
test/test_radioscheduler/test_radioscheduler.cpp
View file

@ -356,6 +356,54 @@ static void test_every_job_gets_one_outcome_across_a_flush() {
}
for(uint8_t i = 0; i < 6; i++) TEST_ASSERT_EQUAL_UINT8(1, outcomes[i]);
}
static void test_no_outcome_is_lost_when_events_arent_collected() {
// loop() collects the events. If it stalls, jobs are refused rather than
// their outcomes thrown away.
RadioScheduler s;
uint32_t accepted = 0;
for(uint32_t i = 0; i < 200; i++) {
if(!submit(s, REMOTE_A)) break;
accepted++;
runNext(s);
}
TEST_ASSERT_TRUE(accepted > 0);
TEST_ASSERT_TRUE(accepted < 200);
TEST_ASSERT_FALSE(s.hasRoom(false));
uint32_t started = 0, finished = 0;
somfy_tx_event_t evt;
while(s.popEvent(evt)) {
if(evt.type == tx_event_t::started) started++;
else if(evt.type == tx_event_t::finished) finished++;
}
TEST_ASSERT_EQUAL_UINT32(accepted, started);
TEST_ASSERT_EQUAL_UINT32(accepted, finished);
TEST_ASSERT_TRUE(s.hasRoom(false));
TEST_ASSERT_NOT_EQUAL(0, submit(s, REMOTE_A));
}
static void test_flush_reports_every_drop_when_events_arent_collected() {
RadioScheduler s;
uint32_t tickets[64];
uint8_t n = 0;
// Outcomes of jobs already sent take up part of the event ring.
for(uint8_t i = 0; i < 20; i++) {
tickets[n] = submit(s, REMOTE_A);
TEST_ASSERT_NOT_EQUAL(0, tickets[n]);
n++;
runNext(s);
}
// Queue as many as are taken.
for(uint32_t t; n < 64 && (t = submit(s, REMOTE_B, 0, true)) != 0;) tickets[n++] = t;
TEST_ASSERT_TRUE(n > 20);
s.flush(0);
uint8_t outcomes[64] = {};
somfy_tx_event_t evt;
while(s.popEvent(evt)) {
if(evt.type == tx_event_t::started) continue;
for(uint8_t i = 0; i < n; i++)
if(tickets[i] == evt.seq) outcomes[i]++;
}
for(uint8_t i = 0; i < n; i++) TEST_ASSERT_EQUAL_UINT8(1, outcomes[i]);
}
static void test_unknown_ticket_is_ignored() {
RadioScheduler s;
TEST_ASSERT_FALSE(s.keepSending(0));
@ -454,6 +502,8 @@ int main(int argc, char **argv) {
RUN_TEST(test_flush_cuts_short_the_job_on_air);
RUN_TEST(test_job_flushed_before_it_starts_is_dropped);
RUN_TEST(test_every_job_gets_one_outcome_across_a_flush);
RUN_TEST(test_no_outcome_is_lost_when_events_arent_collected);
RUN_TEST(test_flush_reports_every_drop_when_events_arent_collected);
RUN_TEST(test_unknown_ticket_is_ignored);
RUN_TEST(test_suspend_flushes_and_refuses_jobs);
RUN_TEST(test_resume_needs_every_reason_cleared);