client: Rename: set_send_alarm → set_resend_alarm

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 78d1dcfd8925c576b362d6fa0d20e09f7686de54..00ee3264a31e6d908419fb43710b22514c863512 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -1,26 +1,21 @@
 #include "pico/cyw43_arch.h"
 #include "pico/stdlib.h"
+#include "pico/util/pheap.h"
 #include "pico/util/queue.h"
 
 #include "blink.h"
 #include "button.h"
 #include "config.h"
 #include "net.h"
+#include "sends.h"
 
-typedef struct {
-  uint32_t timestamp;
-  u16_t seq;
-  u8_t send_count;
-} send_t;
-
-enum event_type { BUTTONPRESS, SEND };
+enum event_type { NEW_BUTTON_PRESS, RESEND_TIME };
 typedef struct {
   enum event_type type;
   union {
     struct {
       uint32_t timestamp;
     } buttonpress;
-    send_t send;
   };
 } event_t;
 
@@ -47,36 +42,73 @@ static void button_pressed() {
   if (time_since_last_press >= config_minimum_seconds_between_button_presses) {
     last_button_press_time = now;
     event_t e;
-    e.type = BUTTONPRESS;
+    e.type = NEW_BUTTON_PRESS;
     e.buttonpress.timestamp = now;
     queue_try_add_ignoring_errors(&queue, &e);
   }
 }
 
+static void time_to_send(uint _) {
+  /* This runs in interrupt context; don't linger.  */
+  event_t e;
+  e.type = RESEND_TIME;
+  queue_try_add_ignoring_errors(&queue, &e);
+}
+
+void set_resend_alarm(int alarm, uint32_t now, uint32_t next_act_time) {
+  uint32_t sleep_duration = next_act_time - now;
+  if (hardware_alarm_set_target(alarm,
+                                make_timeout_time_ms(sleep_duration * 1000)))
+    signal_error_by_blinking();
+  return;
+}
+
+void service_sleeps(int alarm, send_t *sleeping_sends, pheap_t *sleeps_heap) {
+  hardware_alarm_cancel(alarm);
+
+  while (1) {
+    uint32_t now = time_s();
+    int32_t act_time = next_scheduled_send(sleeping_sends, sleeps_heap);
+    if (act_time == -1)
+      return;
+    if (act_time > now) {
+      set_resend_alarm(alarm, now, act_time);
+      return;
+    }
+    pheap_node_id_t i = ph_remove_head(sleeps_heap, false);
+    send_t *send = &sleeping_sends[i];
+    uint32_t ago = now - send->timestamp;
+    send_report_packet(send->seq, ago);
+    send->send_count++;
+    if (send->send_count < config_resend_count)
+      ph_insert_node(sleeps_heap, i);
+    else
+      ph_free_node(sleeps_heap, i);
+  }
+}
+
 void service_queue() {
+  int alarm = hardware_alarm_claim_unused(true);
+  if (alarm == -1)
+    signal_error_by_blinking();
+  hardware_alarm_set_callback(alarm, time_to_send);
+
+  send_t sleeping_sends[PICO_PHEAP_MAX_ENTRIES];
+  pheap_t *sleeps_heap =
+      ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, sleeping_sends);
   u16_t seq = 0;
   while (1) {
+    service_sleeps(alarm, sleeping_sends, sleeps_heap);
+
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
-    case BUTTONPRESS: {
-      event_t send_e;
-      send_e.type = SEND;
-      send_e.send.timestamp = e.buttonpress.timestamp;
-      send_e.send.seq = seq++;
-      send_e.send.send_count = 0;
-      queue_try_add_ignoring_errors(&queue, &send_e);
+    case NEW_BUTTON_PRESS: {
+      create_send(sleeping_sends, sleeps_heap, e.buttonpress.timestamp, seq++);
     } break;
-    case SEND: {
-      uint32_t now = time_s();
-      uint32_t ago = now - e.send.timestamp;
-      send_report(e.send.seq, ago);
-      e.send.send_count++;
-      if (e.send.send_count < config_resend_count)
-        queue_try_add_ignoring_errors(&queue, &e);
-      /* TODO: Sleep elsewhere. */
-      signal(e.send.send_count == 1 ? 2 : 1, 100);
-      sleep_ms(config_resend_interval_ms);
+    case RESEND_TIME: {
+      /* OK, we're awake. Cool. Thanks! (We actually do the sends in the
+       * service_sleeps() call at the top of the loop.)  */
     } break;
     default:
       signal_error_by_blinking();