client: Rename: set_send_alarm → set_resend_alarm

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index c38de126d50245cd3a9ba08d128e170b6c23d75c..00ee3264a31e6d908419fb43710b22514c863512 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -7,24 +7,9 @@
 #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;
-
-uint32_t next_send(send_t *s) {
-  return s->timestamp + (1 << s->send_count) - 1;
-}
-
-bool next_send_less_than(void *user_data, pheap_node_id_t a,
-                         pheap_node_id_t b) {
-  send_t *sends = (send_t *)user_data;
-  return next_send(&sends[a]) < next_send(&sends[b]);
-}
-
-enum event_type { BUTTONPRESS, SEND };
+enum event_type { NEW_BUTTON_PRESS, RESEND_TIME };
 typedef struct {
   enum event_type type;
   union {
@@ -57,7 +42,7 @@ 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);
   }
@@ -66,30 +51,34 @@ static void button_pressed() {
 static void time_to_send(uint _) {
   /* This runs in interrupt context; don't linger.  */
   event_t e;
-  e.type = SEND;
+  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();
-    pheap_node_id_t i = ph_peek_head(sleeps_heap);
-    if (i == 0)
+    int32_t act_time = next_scheduled_send(sleeping_sends, sleeps_heap);
+    if (act_time == -1)
       return;
-    send_t *send = &sleeping_sends[i];
-    if (next_send(send) > now) {
-      uint32_t sleep_duration = next_send(send) - now;
-      if (hardware_alarm_set_target(
-              alarm, make_timeout_time_ms(sleep_duration * 1000)))
-        signal_error_by_blinking();
+    if (act_time > now) {
+      set_resend_alarm(alarm, now, act_time);
       return;
     }
-    if (ph_remove_head(sleeps_heap, false) != i)
-      signal_error_by_blinking();
+    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(send->seq, ago);
+    send_report_packet(send->seq, ago);
     send->send_count++;
     if (send->send_count < config_resend_count)
       ph_insert_node(sleeps_heap, i);
@@ -114,19 +103,10 @@ void service_queue() {
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
-    case BUTTONPRESS: {
-      pheap_node_id_t i = ph_new_node(sleeps_heap);
-      if (i == 0) {
-        /* TODO: Don't drop new presses just because sleeps_heap is full of old
-         * presses. */
-        break;
-      }
-      sleeping_sends[i].timestamp = e.buttonpress.timestamp;
-      sleeping_sends[i].seq = seq++;
-      sleeping_sends[i].send_count = 0;
-      ph_insert_node(sleeps_heap, i);
+    case NEW_BUTTON_PRESS: {
+      create_send(sleeping_sends, sleeps_heap, e.buttonpress.timestamp, seq++);
     } break;
-    case SEND: {
+    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;