Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

serialqueue: Clarify code that associates sent messages to received messages 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2017-06-25 12:44:12 -04:00
parent c8dca0a56c
commit c957e4ba86
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
klippy/serialqueue.c
View File

@ -427,19 +427,26 @@ static void
update_receive_seq(struct serialqueue *sq, double eventtime, uint64_t rseq) update_receive_seq(struct serialqueue *sq, double eventtime, uint64_t rseq)
{ {
// Remove from sent queue // Remove from sent queue
int ack_count = rseq - sq->receive_seq;
uint64_t sent_seq = sq->receive_seq; uint64_t sent_seq = sq->receive_seq;
while (!list_empty(&sq->sent_queue) && ack_count--) { for (;;) {
struct queue_message *sent = list_first_entry( struct queue_message *sent = list_first_entry(
&sq->sent_queue, struct queue_message, node); &sq->sent_queue, struct queue_message, node);
if (rseq == ++sent_seq) if (list_empty(&sq->sent_queue)) {
sq->last_receive_sent_time = sent->receive_time; // Got an ack for a message not sent; must be connection init
sq->send_seq = rseq;
sq->last_receive_sent_time = 0.;
break;
}
list_del(&sent->node); list_del(&sent->node);
debug_queue_add(&sq->old_sent, sent); debug_queue_add(&sq->old_sent, sent);
sent_seq++;
if (rseq == sent_seq) {
// Found sent message corresponding with the received sequence
sq->last_receive_sent_time = sent->receive_time;
break;
}
} }
sq->receive_seq = rseq; sq->receive_seq = rseq;
if (rseq > sq->send_seq)
sq->send_seq = rseq;
pollreactor_update_timer(&sq->pr, SQPT_COMMAND, PR_NOW); pollreactor_update_timer(&sq->pr, SQPT_COMMAND, PR_NOW);
// Update retransmit info // Update retransmit info