client: xcalloc

[tattlekey] / client / press.c

diff --git a/client/press.c b/client/press.c
index 7a7f99678ad6b64d48f6767620bce97fc9065bbc..1c8ce9f1ae2cb4e2318a90192ccbe0ec0150e245 100644 (file)
--- a/client/press.c
+++ b/client/press.c
@@ -11,13 +11,16 @@ static bool next_send_less_than(void *user_data, pheap_node_id_t a,
   return next_send(&presses[a]) < next_send(&presses[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 = (press_t *)xcalloc(PICO_PHEAP_MAX_ENTRIES, sizeof(press_t));
   pp->sleeps_heap =
       ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, pp->presses);
   if (pp->sleeps_heap == NULL)
@@ -25,16 +28,14 @@ press_pile_t *create_press_pile() {
   return pp;
 }
 
-void create_press(press_pile_t *pp, uint32_t timestamp, u16_t seq) {
+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;
   }
-  pp->presses[i].timestamp = timestamp;
-  pp->presses[i].seq = seq;
-  pp->presses[i].send_count = 0;
+  pp->presses[i] = *press;
   ph_insert_node(pp->sleeps_heap, i);
 }
 
@@ -44,3 +45,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;
+}