From: Scott Worley Date: Tue, 10 Oct 2023 06:05:13 +0000 (-0700) Subject: client: get_press_due_for_resend() X-Git-Tag: v0.1.0~32 X-Git-Url: http://git.scottworley.com/tattlekey/commitdiff_plain/9ae691e990a970f89a591c483395c2e00c35b678?ds=sidebyside client: get_press_due_for_resend() This removes the last references to pp's internals outside press.c. --- diff --git a/client/press.c b/client/press.c index 56d95ea..e1eddfc 100644 --- a/client/press.c +++ b/client/press.c @@ -42,3 +42,13 @@ int32_t next_scheduled_send(press_pile_t *pp) { return -1; return next_send(&pp->presses[i]); } + +bool get_press_due_for_resend(press_pile_t *pp, uint32_t now, press_t *press) { + pheap_node_id_t i = ph_peek_head(pp->sleeps_heap); + if (i == 0 || next_send(&pp->presses[i]) > now) + return false; + if (ph_remove_head(pp->sleeps_heap, true) != i) + signal_error_by_blinking(); + *press = pp->presses[i]; + return true; +} diff --git a/client/press.h b/client/press.h index 898bb1a..69789e0 100644 --- a/client/press.h +++ b/client/press.h @@ -25,4 +25,9 @@ void add_press(press_pile_t *pp, press_t *press); * Returns -1 if there's nothing pending. */ int32_t next_scheduled_send(press_pile_t *pp); +/* Find a press ready for resend at or before `now`. + * Move it out of the press-pile `pp` and into into `press`. + * Or return false if there is no press due for re-send. */ +bool get_press_due_for_resend(press_pile_t *pp, uint32_t now, press_t *press); + #endif diff --git a/client/tattlekey.c b/client/tattlekey.c index 88bdd91..9f28e45 100644 --- a/client/tattlekey.c +++ b/client/tattlekey.c @@ -75,15 +75,15 @@ void service_sleeps(int alarm, press_pile_t *pp) { set_resend_alarm(alarm, now, act_time); return; } - pheap_node_id_t i = ph_remove_head(pp->sleeps_heap, false); - press_t *press = &pp->presses[i]; - uint32_t ago = now - press->timestamp; - send_report_packet(press->seq, ago); - press->send_count++; - if (press->send_count < config_resend_count) - ph_insert_node(pp->sleeps_heap, i); - else - ph_free_node(pp->sleeps_heap, i); + press_t press; + if (!get_press_due_for_resend(pp, now, &press)) + signal_error_by_blinking(); + uint32_t ago = now - press.timestamp; + send_report_packet(press.seq, ago); + press.send_count++; + if (press.send_count < config_resend_count) { + add_press(pp, &press); + } } }