Skip to content

Commit d9adeef

Browse files
serges147serges147
committed
fix formatting
1 parent 6181d1e commit d9adeef

File tree

2 files changed

+79
-79
lines changed

2 files changed

+79
-79
lines changed

‎libudpard/udpard.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -404,13 +404,13 @@ static inline byte_t* txSerializeHeader(byte_t* const destination_buffe
404404
/// Produces a chain of Tx queue items for later insertion into the Tx queue. The tail is NULL if OOM.
405405
/// The caller is responsible for freeing the memory allocated for the chain.
406406
static inline TxChain txMakeChain(const struct UdpardTxMemoryResources memory,
407-
const uint_least8_t dscp_value_per_priority[UDPARD_PRIORITY_MAX + 1U],
408-
const size_t mtu,
409-
const UdpardMicrosecond deadline_usec,
410-
const TransferMetadata meta,
411-
const struct UdpardUDPIPEndpoint endpoint,
412-
const struct UdpardPayload payload,
413-
void* const user_transfer_reference)
407+
const uint_least8_t dscp_value_per_priority[UDPARD_PRIORITY_MAX + 1U],
408+
const size_t mtu,
409+
const UdpardMicrosecond deadline_usec,
410+
const TransferMetadata meta,
411+
const struct UdpardUDPIPEndpoint endpoint,
412+
const struct UdpardPayload payload,
413+
void* const user_transfer_reference)
414414
{
415415
UDPARD_ASSERT(mtu > 0);
416416
UDPARD_ASSERT((payload.data != NULL) || (payload.size == 0U));
@@ -443,9 +443,9 @@ static inline TxChain txMakeChain(const struct UdpardTxMemoryResources memory,
443443
{
444444
break;
445445
}
446-
const bool last = (payload_size_with_crc - offset) <= mtu;
446+
const bool last = (payload_size_with_crc - offset) <= mtu;
447447
byte_t* const dst_buffer = item->base.datagram_payload.data;
448-
byte_t* write_ptr = txSerializeHeader(dst_buffer, meta, (uint32_t) out.count, last);
448+
byte_t* write_ptr = txSerializeHeader(dst_buffer, meta, (uint32_t) out.count, last);
449449
if (offset < payload.size)
450450
{
451451
const size_t progress = smaller(payload.size - offset, mtu);

‎tests/src/test_intrusive_tx.c‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ static void testMakeChainEmpty(void)
9696
instrumentedAllocatorNew(&alloc);
9797
const struct UdpardTxMemoryResources mem = {
9898
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
99-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
99+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
100100
};
101-
char user_transfer_referent = '\0';
102-
const TransferMetadata meta = {
103-
.priority = UdpardPriorityFast,
104-
.src_node_id = 1234,
105-
.dst_node_id = 2345,
106-
.data_specifier = 5432,
107-
.transfer_id = 0xBADC0FFEE0DDF00DULL,
101+
char user_transfer_referent = '\0';
102+
const TransferMetadata meta = {
103+
.priority = UdpardPriorityFast,
104+
.src_node_id = 1234,
105+
.dst_node_id = 2345,
106+
.data_specifier = 5432,
107+
.transfer_id = 0xBADC0FFEE0DDF00DULL,
108108
};
109109
const TxChain chain = txMakeChain(mem,
110110
(byte_t[]){11, 22, 33, 44, 55, 66, 77, 88},
@@ -143,15 +143,15 @@ static void testMakeChainSingleMaxMTU(void)
143143
instrumentedAllocatorNew(&alloc);
144144
const struct UdpardTxMemoryResources mem = {
145145
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
146-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
146+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
147147
};
148-
char user_transfer_referent = '\0';
149-
const TransferMetadata meta = {
150-
.priority = UdpardPrioritySlow,
151-
.src_node_id = 4321,
152-
.dst_node_id = 5432,
153-
.data_specifier = 7766,
154-
.transfer_id = 0x0123456789ABCDEFULL,
148+
char user_transfer_referent = '\0';
149+
const TransferMetadata meta = {
150+
.priority = UdpardPrioritySlow,
151+
.src_node_id = 4321,
152+
.dst_node_id = 5432,
153+
.data_specifier = 7766,
154+
.transfer_id = 0x0123456789ABCDEFULL,
155155
};
156156
const TxChain chain = txMakeChain(mem,
157157
(byte_t[]){11, 22, 33, 44, 55, 66, 77, 88},
@@ -197,9 +197,9 @@ static void testMakeChainSingleFrameDefaultMTU(void)
197197
instrumentedAllocatorNew(&alloc);
198198
const struct UdpardTxMemoryResources mem = {
199199
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
200-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
200+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
201201
};
202-
const byte_t payload[UDPARD_MTU_DEFAULT_MAX_SINGLE_FRAME + 1] = {0};
202+
const byte_t payload[UDPARD_MTU_DEFAULT_MAX_SINGLE_FRAME + 1] = {0};
203203
{ // Ensure UDPARD_MTU_DEFAULT_MAX_SINGLE_FRAME bytes fit in a single frame with the default MTU.
204204
const TxChain chain = txMakeChain(mem,
205205
(byte_t[]){11, 22, 33, 44, 55, 66, 77, 88},
@@ -257,15 +257,15 @@ static void testMakeChainThreeFrames(void)
257257
instrumentedAllocatorNew(&alloc);
258258
const struct UdpardTxMemoryResources mem = {
259259
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
260-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
260+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
261261
};
262-
char user_transfer_referent = '\0';
263-
const TransferMetadata meta = {
264-
.priority = UdpardPriorityNominal,
265-
.src_node_id = 4321,
266-
.dst_node_id = 5432,
267-
.data_specifier = 7766,
268-
.transfer_id = 0x0123456789ABCDEFULL,
262+
char user_transfer_referent = '\0';
263+
const TransferMetadata meta = {
264+
.priority = UdpardPriorityNominal,
265+
.src_node_id = 4321,
266+
.dst_node_id = 5432,
267+
.data_specifier = 7766,
268+
.transfer_id = 0x0123456789ABCDEFULL,
269269
};
270270
const size_t mtu = (EtherealStrengthSize + 4U + 3U) / 3U; // Force payload split into three frames.
271271
const TxChain chain = txMakeChain(mem,
@@ -342,15 +342,15 @@ static void testMakeChainCRCSpill1(void)
342342
instrumentedAllocatorNew(&alloc);
343343
const struct UdpardTxMemoryResources mem = {
344344
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
345-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
345+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
346346
};
347-
char user_transfer_referent = '\0';
348-
const TransferMetadata meta = {
349-
.priority = UdpardPriorityNominal,
350-
.src_node_id = 4321,
351-
.dst_node_id = 5432,
352-
.data_specifier = 7766,
353-
.transfer_id = 0x0123456789ABCDEFULL,
347+
char user_transfer_referent = '\0';
348+
const TransferMetadata meta = {
349+
.priority = UdpardPriorityNominal,
350+
.src_node_id = 4321,
351+
.dst_node_id = 5432,
352+
.data_specifier = 7766,
353+
.transfer_id = 0x0123456789ABCDEFULL,
354354
};
355355
const size_t mtu = InterstellarWarSize + 3U;
356356
const TxChain chain = txMakeChain(mem,
@@ -417,15 +417,15 @@ static void testMakeChainCRCSpill2(void)
417417
instrumentedAllocatorNew(&alloc);
418418
const struct UdpardTxMemoryResources mem = {
419419
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
420-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
420+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
421421
};
422-
char user_transfer_referent = '\0';
423-
const TransferMetadata meta = {
424-
.priority = UdpardPriorityNominal,
425-
.src_node_id = 4321,
426-
.dst_node_id = 5432,
427-
.data_specifier = 7766,
428-
.transfer_id = 0x0123456789ABCDEFULL,
422+
char user_transfer_referent = '\0';
423+
const TransferMetadata meta = {
424+
.priority = UdpardPriorityNominal,
425+
.src_node_id = 4321,
426+
.dst_node_id = 5432,
427+
.data_specifier = 7766,
428+
.transfer_id = 0x0123456789ABCDEFULL,
429429
};
430430
const size_t mtu = InterstellarWarSize + 2U;
431431
const TxChain chain = txMakeChain(mem,
@@ -492,15 +492,15 @@ static void testMakeChainCRCSpill3(void)
492492
instrumentedAllocatorNew(&alloc);
493493
const struct UdpardTxMemoryResources mem = {
494494
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
495-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
495+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
496496
};
497-
char user_transfer_referent = '\0';
498-
const TransferMetadata meta = {
499-
.priority = UdpardPriorityNominal,
500-
.src_node_id = 4321,
501-
.dst_node_id = 5432,
502-
.data_specifier = 7766,
503-
.transfer_id = 0x0123456789ABCDEFULL,
497+
char user_transfer_referent = '\0';
498+
const TransferMetadata meta = {
499+
.priority = UdpardPriorityNominal,
500+
.src_node_id = 4321,
501+
.dst_node_id = 5432,
502+
.data_specifier = 7766,
503+
.transfer_id = 0x0123456789ABCDEFULL,
504504
};
505505
const size_t mtu = InterstellarWarSize + 1U;
506506
const TxChain chain = txMakeChain(mem,
@@ -567,15 +567,15 @@ static void testMakeChainCRCSpillFull(void)
567567
instrumentedAllocatorNew(&alloc);
568568
const struct UdpardTxMemoryResources mem = {
569569
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
570-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
570+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
571571
};
572-
char user_transfer_referent = '\0';
573-
const TransferMetadata meta = {
574-
.priority = UdpardPriorityNominal,
575-
.src_node_id = 4321,
576-
.dst_node_id = 5432,
577-
.data_specifier = 7766,
578-
.transfer_id = 0x0123456789ABCDEFULL,
572+
char user_transfer_referent = '\0';
573+
const TransferMetadata meta = {
574+
.priority = UdpardPriorityNominal,
575+
.src_node_id = 4321,
576+
.dst_node_id = 5432,
577+
.data_specifier = 7766,
578+
.transfer_id = 0x0123456789ABCDEFULL,
579579
};
580580
const size_t mtu = InterstellarWarSize;
581581
const TxChain chain = txMakeChain(mem,
@@ -638,9 +638,9 @@ static void testPushPeekPopFree(void)
638638
instrumentedAllocatorNew(&alloc);
639639
const struct UdpardTxMemoryResources mem = {
640640
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
641-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
641+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
642642
};
643-
const UdpardNodeID node_id = 1234;
643+
const UdpardNodeID node_id = 1234;
644644
//
645645
UdpardTx tx = {
646646
.local_node_id = &node_id,
@@ -720,9 +720,9 @@ static void testPushPrioritization(void)
720720
instrumentedAllocatorNew(&alloc);
721721
const struct UdpardTxMemoryResources mem = {
722722
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
723-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
723+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
724724
};
725-
const UdpardNodeID node_id = 1234;
725+
const UdpardNodeID node_id = 1234;
726726
//
727727
UdpardTx tx = {
728728
.local_node_id = &node_id,
@@ -894,9 +894,9 @@ static void testPushCapacityLimit(void)
894894
instrumentedAllocatorNew(&alloc);
895895
const struct UdpardTxMemoryResources mem = {
896896
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
897-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
897+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
898898
};
899-
const UdpardNodeID node_id = 1234;
899+
const UdpardNodeID node_id = 1234;
900900
//
901901
UdpardTx tx = {
902902
.local_node_id = &node_id,
@@ -932,9 +932,9 @@ static void testPushOOM(void)
932932
instrumentedAllocatorNew(&alloc);
933933
const struct UdpardTxMemoryResources mem = {
934934
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
935-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
935+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
936936
};
937-
const UdpardNodeID node_id = 1234;
937+
const UdpardNodeID node_id = 1234;
938938
//
939939
UdpardTx tx = {
940940
.local_node_id = &node_id,
@@ -971,9 +971,9 @@ static void testPushAnonymousMultiFrame(void)
971971
instrumentedAllocatorNew(&alloc);
972972
const struct UdpardTxMemoryResources mem = {
973973
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
974-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
974+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
975975
};
976-
const UdpardNodeID node_id = 0xFFFFU;
976+
const UdpardNodeID node_id = 0xFFFFU;
977977
//
978978
UdpardTx tx = {
979979
.local_node_id = &node_id,
@@ -1009,9 +1009,9 @@ static void testPushAnonymousService(void)
10091009
instrumentedAllocatorNew(&alloc);
10101010
const struct UdpardTxMemoryResources mem = {
10111011
.fragment = instrumentedAllocatorMakeMemoryResource(&alloc),
1012-
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
1012+
.payload = instrumentedAllocatorMakeMemoryResource(&alloc),
10131013
};
1014-
const UdpardNodeID node_id = 0xFFFFU;
1014+
const UdpardNodeID node_id = 0xFFFFU;
10151015
//
10161016
UdpardTx tx = {
10171017
.local_node_id = &node_id,

0 commit comments

Comments
 (0)