Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "sock/udp: work around gnrc_sock_recv() returning early timeout" #21126

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "sock/udp: work around gnrc_sock_recv() returning early timeout" #21126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 1 addition & 30 deletions sys/net/gnrc/sock/udp/gnrc_sock_udp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,16 +239,6 @@ static bool _accept_remote(const sock_udp_t *sock, const udp_hdr_t *hdr,
return true;
}

static uint32_t _now_us(void)
{
#ifdef MODULE_ZTIMER_USEC
return ztimer_now(ZTIMER_USEC);
#endif
#ifdef MODULE_ZTIMER_MSEC
return ztimer_now(ZTIMER_MSEC) * US_PER_MS;
#endif
}

ssize_t sock_udp_recv_buf_aux(sock_udp_t *sock, void **data, void **buf_ctx,
uint32_t timeout, sock_udp_ep_t *remote,
sock_udp_aux_rx_t *aux)
Expand Down Expand Up @@ -286,26 +276,7 @@ ssize_t sock_udp_recv_buf_aux(sock_udp_t *sock, void **data, void **buf_ctx,
_aux.rssi = &aux->rssi;
}
#endif
unsigned now = _now_us();
while (1) {
res = gnrc_sock_recv((gnrc_sock_reg_t *)sock, &pkt, timeout, &tmp, &_aux);

if (res != -ETIMEDOUT) {
break;
}

/* HACK: gnrc_sock_recv() sometimes returns -ETIMEDOUT too early */
uint32_t time_elapsed = _now_us() - now;
if (time_elapsed < (timeout - timeout/10)) {
DEBUG("gnrc_sock_udp: timeout happened %"PRIu32" µs early\n",
timeout - time_elapsed);
timeout -= time_elapsed;
now = _now_us();
continue;
}
break;
}

res = gnrc_sock_recv((gnrc_sock_reg_t *)sock, &pkt, timeout, &tmp, &_aux);
if (res < 0) {
return res;
}
Expand Down
Loading