X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/9ae691e990a970f89a591c483395c2e00c35b678..a36c278f05a806c9ced1a96b04eae0e6b9d8a5d5:/client/press.c?ds=inline

diff --git a/client/press.c b/client/press.c
index e1eddfc..6c46ae9 100644
--- a/client/press.c
+++ b/client/press.c
@@ -1,54 +1,81 @@
 #include "press.h"
 #include "blink.h"
+#include "config.h"
 
-static uint32_t next_send(press_t *s) {
+static uint32_t press_next_send(press_t *s) {
   return s->timestamp + (1 << s->send_count) - 1;
 }
 
+static uint32_t press_queue_next_send(queue_t *q) {
+  press_t press;
+  return queue_try_peek(q, &press) ? press_next_send(&press) : UINT32_MAX;
+}
+
 static bool next_send_less_than(void *user_data, pheap_node_id_t a,
                                 pheap_node_id_t b) {
-  press_t *presses = (press_t *)user_data;
-  return next_send(&presses[a]) < next_send(&presses[b]);
+  queue_t **sleeps = (queue_t **)user_data;
+  return press_queue_next_send(sleeps[a]) < press_queue_next_send(sleeps[b]);
 }
 
-press_pile_t *create_press_pile() {
-  press_pile_t *pp = (press_pile_t *)malloc(sizeof(press_pile_t));
-  if (pp == NULL)
-    signal_error_by_blinking();
-  pp->presses = calloc(PICO_PHEAP_MAX_ENTRIES, sizeof(press_t));
-  if (pp->presses == NULL)
+static void *xcalloc(size_t nmemb, size_t size) {
+  void *p = calloc(nmemb, size);
+  if (p == NULL)
     signal_error_by_blinking();
+  return p;
+}
+
+press_pile_t *create_press_pile() {
+  press_pile_t *pp = (press_pile_t *)xcalloc(1, sizeof(press_pile_t));
+  pp->presses = (queue_t *)xcalloc(config_resend_count, sizeof(queue_t));
+  pp->sleeps = (queue_t **)xcalloc(config_resend_count, sizeof(queue_t *));
+  for (int i = 0; i < config_resend_count; i++) {
+    const uint paranoid_safety_fudge = 10;
+    uint element_count = paranoid_safety_fudge + (1 << i);
+    element_count = MAX(element_count, config_minimum_queue_size);
+    element_count = MIN(element_count, config_maximum_queue_size);
+    queue_init(&pp->presses[i], sizeof(press_t), element_count);
+  }
   pp->sleeps_heap =
-      ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, pp->presses);
+      ph_create(config_resend_count, next_send_less_than, pp->sleeps);
   if (pp->sleeps_heap == NULL)
     signal_error_by_blinking();
   return pp;
 }
 
 void add_press(press_pile_t *pp, press_t *press) {
-  pheap_node_id_t i = ph_new_node(pp->sleeps_heap);
-  if (i == 0) {
-    /* TODO: Don't drop new presses just because sleeps_heap is full of old
-     * presses. */
-    return;
+  int sc = press->send_count;
+  if (sc >= config_resend_count)
+    signal_error_by_blinking();
+  bool was_empty = queue_is_empty(&pp->presses[sc]);
+  /* No error check; blithely continue if the queue was full. */
+  queue_try_add(&pp->presses[sc], press);
+  if (was_empty) {
+    pheap_node_id_t i = ph_new_node(pp->sleeps_heap);
+    pp->sleeps[i] = &pp->presses[sc];
+    ph_insert_node(pp->sleeps_heap, i);
   }
-  pp->presses[i] = *press;
-  ph_insert_node(pp->sleeps_heap, i);
 }
 
 int32_t next_scheduled_send(press_pile_t *pp) {
   pheap_node_id_t i = ph_peek_head(pp->sleeps_heap);
   if (i == 0)
     return -1;
-  return next_send(&pp->presses[i]);
+  return press_queue_next_send(pp->sleeps[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)
+  if (i == 0 || press_queue_next_send(pp->sleeps[i]) > now)
     return false;
-  if (ph_remove_head(pp->sleeps_heap, true) != i)
+  if (!queue_try_remove(pp->sleeps[i], press))
     signal_error_by_blinking();
-  *press = pp->presses[i];
+  bool became_empty = queue_is_empty(pp->sleeps[i]);
+  if (ph_remove_head(pp->sleeps_heap, became_empty) != i)
+    signal_error_by_blinking();
+  if (became_empty) {
+    pp->sleeps[i] = NULL;
+  } else {
+    ph_insert_node(pp->sleeps_heap, i);
+  }
   return true;
 }