From bec8f9ac7d6ebefbce6bd4c882c0f9616f561f1c Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sat, 9 Apr 2022 11:33:39 +0200 Subject: lib: Rename timerwheel_ack timerwheel_delayed_ack This makes it clear that we are scheduling a potential delayed acknowledgment instead of acknowledging a packet scheduled for retransmission. Also some small cosmetic fixes. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- CMakeLists.txt | 2 +- src/lib/frct.c | 6 ++---- src/lib/timerwheel.c | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4aad8746..2a6ecc77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ include(GNUInstallDirs) set(PACKAGE_VERSION_MAJOR 0) set(PACKAGE_VERSION_MINOR 19) -set(PACKAGE_VERSION_PATCH 1) +set(PACKAGE_VERSION_PATCH 2) set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set(PACKAGE_DESCRIPTION "The Ouroboros prototype") diff --git a/src/lib/frct.c b/src/lib/frct.c index c2dfbf6b..d543ccb0 100644 --- a/src/lib/frct.c +++ b/src/lib/frct.c @@ -925,15 +925,13 @@ static void __frcti_rcv(struct frcti * frcti, pthread_rwlock_unlock(&frcti->lock); if (fd != -1) - timerwheel_ack(fd, frcti); + timerwheel_delayed_ack(fd, frcti); return; drop_packet: pthread_rwlock_unlock(&frcti->lock); - - send_frct_pkt(frcti); - shm_rdrbuff_remove(ai.rdrb, idx); + send_frct_pkt(frcti); return; } diff --git a/src/lib/timerwheel.c b/src/lib/timerwheel.c index cf4e1eef..7f43210f 100644 --- a/src/lib/timerwheel.c +++ b/src/lib/timerwheel.c @@ -200,7 +200,7 @@ static void timerwheel_move(void) if (r->seqno == r->frcti->rttseq) { r->frcti->rto += - f->frcti->rto >> RTO_DIV; + r->frcti->rto >> RTO_DIV; r->frcti->probe = false; } #ifdef PROC_FLOW_STATS @@ -372,8 +372,8 @@ static int timerwheel_rxm(struct frcti * frcti, return 0; } -static int timerwheel_ack(int fd, - struct frcti * frcti) +static int timerwheel_delayed_ack(int fd, + struct frcti * frcti) { struct timespec now; struct ack * a; -- cgit v1.2.3