X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/b512ec26593fde453ce121f30ba8d36b1e3678df..17461dece177a2ca6e34a0cc7412b2352a1e8053:/client/sends.c?ds=inline diff --git a/client/sends.c b/client/sends.c index 0125bf2..d4fa622 100644 --- a/client/sends.c +++ b/client/sends.c @@ -1,32 +1,32 @@ #include "sends.h" -static uint32_t next_send(send_t *s) { +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) { - send_t *sends = (send_t *)user_data; - return next_send(&sends[a]) < next_send(&sends[b]); + press_t *presses = (press_t *)user_data; + return next_send(&presses[a]) < next_send(&presses[b]); } -void create_send(send_t *sleeping_sends, pheap_t *sleeps_heap, - uint32_t timestamp, u16_t seq) { +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); if (i == 0) { /* TODO: Don't drop new presses just because sleeps_heap is full of old * presses. */ return; } - sleeping_sends[i].timestamp = timestamp; - sleeping_sends[i].seq = seq; - sleeping_sends[i].send_count = 0; + presses[i].timestamp = timestamp; + presses[i].seq = seq; + presses[i].send_count = 0; ph_insert_node(sleeps_heap, i); } -int32_t next_scheduled_send(send_t *sleeping_sends, pheap_t *sleeps_heap) { +int32_t next_scheduled_send(press_t *presses, pheap_t *sleeps_heap) { pheap_node_id_t i = ph_peek_head(sleeps_heap); if (i == 0) return -1; - return next_send(&sleeping_sends[i]); + return next_send(&presses[i]); }