tests green

Author: pavel-kirienko

libudpard/udpard.c

@@ -757,6 +757,7 @@ static void tx_send_ack(udpard_rx_t* const    rx,
     ptr = serialize_u64(ptr, topic_hash);
     ptr = serialize_u64(ptr, transfer_id);
     UDPARD_ASSERT((ptr - header) == UDPARD_P2P_HEADER_BYTES);
+    (void)ptr;
     const udpard_bytes_t payload = { .size = UDPARD_P2P_HEADER_BYTES, .data = header };
 
     // Enqueue the ack transfer.
@@ -1734,6 +1735,7 @@ static void rx_p2p_on_message(udpard_rx_t* const rx, udpard_rx_port_t* const por
     ptr                  = deserialize_u64(ptr, &topic_hash);
     ptr                  = deserialize_u64(ptr, &transfer_id);
     UDPARD_ASSERT((ptr == (UDPARD_P2P_HEADER_BYTES + (byte_t*)frag0->view.data)));
+    (void)ptr;
 
     // Remove the header from the view.
     frag0->view.size -= UDPARD_P2P_HEADER_BYTES;
@@ -1770,7 +1772,7 @@ bool udpard_rx_port_new_p2p(udpard_rx_port_p2p_t* const              self,
                                                    .on_collision = rx_p2p_on_collision };
     if ((self != NULL) && (vtable != NULL) && (vtable->on_message != NULL)) {
         self->vtable = vtable;
-        return udpard_rx_port_new((udpard_rx_port_t*)&self, //
+        return udpard_rx_port_new((udpard_rx_port_t*)self, //
                                   local_uid,
                                   extent + UDPARD_P2P_HEADER_BYTES,
                                   UDPARD_RX_REORDERING_WINDOW_UNORDERED,

tests/src/test_e2e_edge.cpp

@@ -15,14 +15,12 @@ namespace {
 
 void                              on_message(udpard_rx_t* rx, udpard_rx_port_t* port, udpard_rx_transfer_t transfer);
 void                              on_collision(udpard_rx_t* rx, udpard_rx_port_t* port, udpard_remote_t remote);
-void                              on_ack_mandate(udpard_rx_t* rx, udpard_rx_port_t* port, udpard_rx_ack_mandate_t am);
-constexpr udpard_rx_port_vtable_t callbacks{ &on_message, &on_collision, &on_ack_mandate };
+constexpr udpard_rx_port_vtable_t callbacks{ &on_message, &on_collision };
 
 struct Context
 {
     std::vector<uint64_t> ids;
     size_t                collisions   = 0;
-    size_t                ack_mandates = 0;
     uint64_t              expected_uid = 0;
     udpard_udpip_ep_t     source       = {};
 };
@@ -62,7 +60,8 @@ struct Fixture
         dest               = udpard_make_subject_endpoint(222U);
 
         TEST_ASSERT_TRUE(udpard_tx_new(&tx, 0x0A0B0C0D0E0F1011ULL, 16, tx_mem));
-        udpard_rx_new(&rx);
+        std::array<udpard_tx_t*, UDPARD_NETWORK_INTERFACE_COUNT_MAX> rx_tx{};
+        udpard_rx_new(&rx, rx_tx.data(), 0);
         ctx.expected_uid = tx.local_uid;
         ctx.source       = source;
         rx.user          = &ctx;
@@ -122,12 +121,6 @@ void on_collision(udpard_rx_t* const rx, udpard_rx_port_t* const /*port*/, const
     ctx->collisions++;
 }
 
-void on_ack_mandate(udpard_rx_t* const rx, udpard_rx_port_t* const /*port*/, const udpard_rx_ack_mandate_t /*am*/)
-{
-    auto* const ctx = static_cast<Context*>(rx->user);
-    ctx->ack_mandates++;
-}
-
 /// UNORDERED mode should drop duplicates while keeping arrival order.
 void test_udpard_rx_unordered_duplicates()
 {
@@ -148,7 +141,6 @@ void test_udpard_rx_unordered_duplicates()
         TEST_ASSERT_EQUAL_UINT64(expected[i], fix.ctx.ids[i]);
     }
     TEST_ASSERT_EQUAL_size_t(0, fix.ctx.collisions);
-    TEST_ASSERT_EQUAL_size_t(0, fix.ctx.ack_mandates);
 }
 
 /// ORDERED mode waits for the window, then rejects late arrivals.
@@ -190,7 +182,6 @@ void test_udpard_rx_ordered_out_of_order()
         TEST_ASSERT_EQUAL_UINT64(expected[i], fix.ctx.ids[i]);
     }
     TEST_ASSERT_EQUAL_size_t(0, fix.ctx.collisions);
-    TEST_ASSERT_EQUAL_size_t(0, fix.ctx.ack_mandates);
 }
 
 /// ORDERED mode after head advance should reject late IDs arriving after window expiry.
@@ -226,7 +217,6 @@ void test_udpard_rx_ordered_head_advanced_late()
         TEST_ASSERT_EQUAL_UINT64(expected[i], fix.ctx.ids[i]);
     }
     TEST_ASSERT_EQUAL_size_t(0, fix.ctx.collisions);
-    TEST_ASSERT_EQUAL_size_t(0, fix.ctx.ack_mandates);
 }
 
 } // namespace

tests/src/test_e2e_random.cpp

@@ -44,7 +44,6 @@ struct Context
     std::unordered_map<TransferKey, ExpectedPayload, TransferKeyHash> expected;
     size_t                                                            received         = 0;
     size_t                                                            collisions       = 0;
-    size_t                                                            ack_mandates     = 0;
     size_t                                                            truncated        = 0;
     uint64_t                                                          remote_uid       = 0;
     std::array<udpard_udpip_ep_t, UDPARD_NETWORK_INTERFACE_COUNT_MAX> remote_endpoints = {};
@@ -122,15 +121,7 @@ void on_collision(udpard_rx_t* const rx, udpard_rx_port_t* const port, const udp
     (void)remote;
     ctx->collisions++;
 }
-
-void on_ack_mandate(udpard_rx_t* const rx, udpard_rx_port_t* const port, const udpard_rx_ack_mandate_t mandate)
-{
-    auto* ctx = static_cast<Context*>(rx->user);
-    (void)port;
-    (void)mandate;
-    ctx->ack_mandates++;
-}
-constexpr udpard_rx_port_vtable_t callbacks{ &on_message, &on_collision, &on_ack_mandate };
+constexpr udpard_rx_port_vtable_t callbacks{ &on_message, &on_collision };
 
 /// Randomized end-to-end TX/RX covering fragmentation, reordering, and extent-driven truncation.
 void test_udpard_tx_rx_end_to_end()
@@ -156,7 +147,8 @@ void test_udpard_tx_rx_end_to_end()
     const udpard_rx_mem_resources_t rx_mem{ .session  = instrumented_allocator_make_resource(&rx_alloc_session),
                                             .fragment = instrumented_allocator_make_resource(&rx_alloc_frag) };
     udpard_rx_t                     rx;
-    udpard_rx_new(&rx);
+    std::array<udpard_tx_t*, UDPARD_NETWORK_INTERFACE_COUNT_MAX> rx_tx{};
+    udpard_rx_new(&rx, rx_tx.data(), 0);
 
     // Test parameters.
     constexpr std::array<uint64_t, 3>    topic_hashes{ 0x123456789ABCDEF0ULL,
@@ -266,7 +258,6 @@ void test_udpard_tx_rx_end_to_end()
     TEST_ASSERT_EQUAL_size_t(1000, ctx.received);
     TEST_ASSERT_TRUE(ctx.truncated > 0);
     TEST_ASSERT_EQUAL_size_t(0, ctx.collisions);
-    TEST_ASSERT_EQUAL_size_t(0, ctx.ack_mandates);
     for (auto& port : ports) {
         udpard_rx_port_free(&rx, &port);
     }