c/libuv
1
0
Fork 0
mirror of https://github.com/libuv/libuv synced 2025-03-28 21:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: fix flaky flaky udp_mmsg test (#4652)

Browse Source 
Replace comparison of `alloc_cb_called` with the total bytes
read (`bytes_read`) to validate the test's correctness.

Fixes: https://github.com/libuv/libuv/issues/4650
Signed-off-by: Juan José Arboleda <soyjuanarbol@gmail.com>
This commit is contained in:
Juan José 2024-12-15 14:24:20 -05:00 committed by GitHub
parent e8969bff6c
commit 3d78d121f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/test-udp-mmsg.c
View File

@ -32,12 +32,12 @@
#define BUFFER_MULTIPLIER 20 #define BUFFER_MULTIPLIER 20
#define MAX_DGRAM_SIZE (64 * 1024) #define MAX_DGRAM_SIZE (64 * 1024)
#define NUM_SENDS 40 #define NUM_SENDS 40
#define EXPECTED_MMSG_ALLOCS (NUM_SENDS / BUFFER_MULTIPLIER)
static uv_udp_t recver; static uv_udp_t recver;
static uv_udp_t sender; static uv_udp_t sender;
static int recv_cb_called; static int recv_cb_called;
static int received_datagrams; static int received_datagrams;
static int read_bytes;
static int close_cb_called; static int close_cb_called;
static int alloc_cb_called; static int alloc_cb_called;
@ -74,6 +74,7 @@ static void recv_cb(uv_udp_t* handle,
const struct sockaddr* addr, const struct sockaddr* addr,
unsigned flags) { unsigned flags) {
ASSERT_GE(nread, 0); ASSERT_GE(nread, 0);
read_bytes += nread;
/* free and return if this is a mmsg free-only callback invocation */ /* free and return if this is a mmsg free-only callback invocation */
if (flags & UV_UDP_MMSG_FREE) { if (flags & UV_UDP_MMSG_FREE) {
@ -140,7 +141,7 @@ TEST_IMPL(udp_mmsg) {
/* On platforms that don't support mmsg, each recv gets its own alloc */ /* On platforms that don't support mmsg, each recv gets its own alloc */
if (uv_udp_using_recvmmsg(&recver)) if (uv_udp_using_recvmmsg(&recver))
ASSERT_EQ(alloc_cb_called, EXPECTED_MMSG_ALLOCS); ASSERT_EQ(read_bytes, NUM_SENDS * 4); /* we're sending 4 bytes per datagram */
else else
ASSERT_EQ(alloc_cb_called, recv_cb_called); ASSERT_EQ(alloc_cb_called, recv_cb_called);