client: Bundle press_t[] & pheap_t* together as press_pile_t

diff --git a/client/press.c b/client/press.c
index 49b2b9a875eb9473c1b794de0be1eb976fe8338f..7a7f99678ad6b64d48f6767620bce97fc9065bbc 100644 (file)
--- a/client/press.c
+++ b/client/press.c
@@ -1,32 +1,46 @@
 #include "press.h"
 #include "press.h"

+#include "blink.h"

 
 static uint32_t next_send(press_t *s) {
   return s->timestamp + (1 << s->send_count) - 1;
 }
 
 
 static uint32_t next_send(press_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) {
+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]);
 }
 
   press_t *presses = (press_t *)user_data;
   return next_send(&presses[a]) < next_send(&presses[b]);
 }
 

-void create_press(press_t *presses, pheap_t *sleeps_heap, uint32_t timestamp,
-                  u16_t seq) {
-  pheap_node_id_t i = ph_new_node(sleeps_heap);
+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)
+    signal_error_by_blinking();
+  pp->sleeps_heap =
+      ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, pp->presses);
+  if (pp->sleeps_heap == NULL)
+    signal_error_by_blinking();
+  return pp;
+}
+
+void create_press(press_pile_t *pp, uint32_t timestamp, u16_t seq) {
+  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;
   }
   if (i == 0) {
     /* TODO: Don't drop new presses just because sleeps_heap is full of old
      * presses. */
     return;
   }

-  presses[i].timestamp = timestamp;
-  presses[i].seq = seq;
-  presses[i].send_count = 0;
-  ph_insert_node(sleeps_heap, i);
+  pp->presses[i].timestamp = timestamp;
+  pp->presses[i].seq = seq;
+  pp->presses[i].send_count = 0;
+  ph_insert_node(pp->sleeps_heap, i);

 }
 
 }
 

-int32_t next_scheduled_send(press_t *presses, pheap_t *sleeps_heap) {
-  pheap_node_id_t i = ph_peek_head(sleeps_heap);
+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;
   if (i == 0)
     return -1;

-  return next_send(&presses[i]);
+  return next_send(&pp->presses[i]);

 }
 }

diff --git a/client/press.h b/client/press.h
index b13f9a8e65b0b38e0053cd647110f851fd097bd7..cd34b3df0b48aeb4189e8b9a0b393347121281f6 100644 (file)
--- a/client/press.h
+++ b/client/press.h
@@ -10,13 +10,17 @@ typedef struct {
   u8_t send_count;
 } press_t;
 
   u8_t send_count;
 } press_t;
 

-bool next_send_less_than(void *user_data, pheap_node_id_t a, pheap_node_id_t b);
+typedef struct {
+  press_t *presses;
+  pheap_t *sleeps_heap;
+} press_pile_t;
+
+press_pile_t *create_press_pile();

 
 

-void create_press(press_t *presses, pheap_t *sleeps_heap, uint32_t timestamp,
-                  u16_t seq);
+void create_press(press_pile_t *pp, uint32_t timestamp, u16_t seq);

 
 /* When do we next need to send something (in seconds since boot)?
  * Returns -1 if there's nothing pending. */
 
 /* When do we next need to send something (in seconds since boot)?
  * Returns -1 if there's nothing pending. */

-int32_t next_scheduled_send(press_t *presses, pheap_t *sleeps_heap);
+int32_t next_scheduled_send(press_pile_t *pp);

 
 #endif
 
 #endif

diff --git a/client/tattlekey.c b/client/tattlekey.c
index e59de2fa3807c59ff37a431a3bac29570fbc8ec7..2f643235b8fe893e611c19682f643729f0c7a5c6 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -63,27 +63,27 @@ void set_resend_alarm(int alarm, uint32_t now, uint32_t next_act_time) {
   return;
 }
 
   return;
 }
 

-void service_sleeps(int alarm, press_t *presses, pheap_t *sleeps_heap) {
+void service_sleeps(int alarm, press_pile_t *pp) {

   hardware_alarm_cancel(alarm);
 
   while (1) {
     uint32_t now = time_s();
   hardware_alarm_cancel(alarm);
 
   while (1) {
     uint32_t now = time_s();

-    int32_t act_time = next_scheduled_send(presses, sleeps_heap);
+    int32_t act_time = next_scheduled_send(pp);

     if (act_time == -1)
       return;
     if (act_time > now) {
       set_resend_alarm(alarm, now, act_time);
       return;
     }
     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);
-    press_t *press = &presses[i];
+    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)
     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(sleeps_heap, i);
+      ph_insert_node(pp->sleeps_heap, i);

     else
     else

-      ph_free_node(sleeps_heap, i);
+      ph_free_node(pp->sleeps_heap, i);

   }
 }
 
   }
 }
 


@@ -93,18 +93,16 @@ void service_queue() {
     signal_error_by_blinking();
   hardware_alarm_set_callback(alarm, time_to_send);
 
     signal_error_by_blinking();
   hardware_alarm_set_callback(alarm, time_to_send);
 

-  press_t presses[PICO_PHEAP_MAX_ENTRIES];
-  pheap_t *sleeps_heap =
-      ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, presses);
+  press_pile_t *pp = create_press_pile();

   u16_t seq = 0;
   while (1) {
   u16_t seq = 0;
   while (1) {

-    service_sleeps(alarm, presses, sleeps_heap);
+    service_sleeps(alarm, pp);

 
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     case NEW_BUTTON_PRESS: {
 
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     case NEW_BUTTON_PRESS: {

-      create_press(presses, sleeps_heap, e.buttonpress.timestamp, seq++);
+      create_press(pp, e.buttonpress.timestamp, seq++);

     } break;
     case RESEND_TIME: {
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the
     } break;
     case RESEND_TIME: {
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the