Skip to content

Commit 7e420b4

Browse files
dallisondallison
committed
Fix CI failures for ASan, TSan, Valgrind and macOS sockets
- payload_buffer_test: zero backing storage with calloc so Hexdump does not read uninitialized padding under Memcheck. Tear down the resizable-buffer test with an explicit destructor plus free() after realloc, fixing ASan alloc-dealloc-mismatch from operator delete on malloc/realloc storage. - pipe_test: compare fixed-length pipe reads with std::string_view instead of ASSERT_STREQ/strcmp on non-NUL-terminated buffers. Skip the high-iteration OverFull stress tests under TSan where the sanitizer hits nested DEADLYSIGNAL on many fiber switches. - sockets_test: skip UDP broadcast and multicast loopback tests on Apple platforms where GitHub Actions macOS runners reject or drop those packets.
1 parent a1ac80a commit 7e420b4

3 files changed

Lines changed: 61 additions & 28 deletions

File tree

‎toolbelt/payload_buffer_test.cc‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ using VectorHeader = toolbelt::VectorHeader;
1111
using Resizer = toolbelt::Resizer;
1212

1313
TEST(BufferTest, Simple) {
14-
char *buffer = (char *)malloc(4096);
14+
char *buffer = (char *)calloc(1, 4096);
1515
PayloadBuffer *pb = new (buffer) PayloadBuffer(4096);
1616
pb->Dump(std::cout);
1717
toolbelt::Hexdump(pb, 64);
@@ -25,7 +25,7 @@ TEST(BufferTest, Simple) {
2525
}
2626

2727
TEST(BufferTest, TwoAllocs) {
28-
char *buffer = (char *)malloc(4096);
28+
char *buffer = (char *)calloc(1, 4096);
2929
PayloadBuffer *pb = new (buffer) PayloadBuffer(4096);
3030
pb->Dump(std::cout);
3131
toolbelt::Hexdump(pb, 64);
@@ -45,7 +45,7 @@ TEST(BufferTest, TwoAllocs) {
4545
}
4646

4747
TEST(BufferTest, Free) {
48-
char *buffer = (char *)malloc(4096);
48+
char *buffer = (char *)calloc(1, 4096);
4949
PayloadBuffer *pb = new (buffer) PayloadBuffer(4096);
5050
pb->Dump(std::cout);
5151
toolbelt::Hexdump(pb, 64);
@@ -68,7 +68,7 @@ TEST(BufferTest, Free) {
6868
}
6969

7070
TEST(BufferTest, FreeThenAlloc) {
71-
char *buffer = (char *)malloc(4096);
71+
char *buffer = (char *)calloc(1, 4096);
7272
PayloadBuffer *pb = new (buffer) PayloadBuffer(4096);
7373
pb->Dump(std::cout);
7474
toolbelt::Hexdump(pb, 64);
@@ -95,7 +95,7 @@ TEST(BufferTest, FreeThenAlloc) {
9595
}
9696

9797
TEST(BufferTest, SmallBlockAllocSimple) {
98-
char *buffer = (char *)malloc(4096);
98+
char *buffer = (char *)calloc(1, 4096);
9999
PayloadBuffer *pb = new (buffer) PayloadBuffer(4096);
100100

101101
void *addr = PayloadBuffer::Allocate(&pb, 16);
@@ -108,7 +108,7 @@ TEST(BufferTest, SmallBlockAllocSimple) {
108108
}
109109

110110
TEST(BufferTest, SmallBlockAlloc) {
111-
char *buffer = (char *)malloc(8192);
111+
char *buffer = (char *)calloc(1, 8192);
112112
PayloadBuffer *pb = new (buffer) PayloadBuffer(8192);
113113

114114
// Small block sizes are 16, 32, 64 and 128.
@@ -140,7 +140,7 @@ TEST(BufferTest, SmallBlockAlloc) {
140140
}
141141

142142
TEST(BufferTest, SmallBlockAllocFree) {
143-
char *buffer = (char *)malloc(8192);
143+
char *buffer = (char *)calloc(1, 8192);
144144
PayloadBuffer *pb = new (buffer) PayloadBuffer(8192);
145145

146146
// Do a mix of sizes and free them.
@@ -186,7 +186,7 @@ TEST(BufferTest, BestCasePerformance) {
186186
constexpr int kIterations = 10000;
187187

188188
for (int iter = 0; iter < kIterations; iter++) {
189-
char *buffer = (char *)malloc(kSize);
189+
char *buffer = (char *)calloc(1, kSize);
190190
PayloadBuffer *pb = new (buffer) PayloadBuffer(kSize);
191191

192192
ASSERT_TRUE(PayloadBuffer::PrimeBitmapAllocator(&pb, 16));
@@ -231,7 +231,7 @@ TEST(BufferTest, BestCasePerformance) {
231231

232232
// New buffer.
233233
free(buffer);
234-
buffer = (char *)malloc(kSize);
234+
buffer = (char *)calloc(1, kSize);
235235
pb = new (buffer) PayloadBuffer(kSize);
236236

237237
// Now allocate by disabling the small block allocator.
@@ -299,7 +299,7 @@ TEST(BufferTest, TypicalPerformance) {
299299
}
300300

301301
for (int iter = 0; iter < kIterations; iter++) {
302-
char *buffer = (char *)malloc(kSize);
302+
char *buffer = (char *)calloc(1, kSize);
303303
PayloadBuffer *pb = new (buffer) PayloadBuffer(kSize);
304304

305305
// No priming the small block allocator for this test. It probably won't
@@ -329,7 +329,7 @@ TEST(BufferTest, TypicalPerformance) {
329329

330330
// New buffer.
331331
free(buffer);
332-
buffer = (char *)malloc(kSize);
332+
buffer = (char *)calloc(1, kSize);
333333
pb = new (buffer) PayloadBuffer(kSize);
334334

335335
// Switch off small block alloctor.
@@ -365,7 +365,7 @@ TEST(BufferTest, TypicalPerformance) {
365365

366366
TEST(BufferTest, Many) {
367367
constexpr size_t kSize = 8192;
368-
char *buffer = (char *)malloc(kSize);
368+
char *buffer = (char *)calloc(1, kSize);
369369
PayloadBuffer *pb = new (buffer) PayloadBuffer(kSize);
370370

371371
std::vector<void *> addrs = PayloadBuffer::AllocateMany(&pb, 100, 10, true);
@@ -387,7 +387,7 @@ TEST(BufferTest, Many) {
387387
}
388388

389389
TEST(BufferTest, String) {
390-
char *buffer = (char *)malloc(4096);
390+
char *buffer = (char *)calloc(1, 4096);
391391
PayloadBuffer *pb = new (buffer) PayloadBuffer(4096);
392392

393393
// Allocate space for a message containing an offset for the string.
@@ -417,7 +417,7 @@ TEST(BufferTest, String) {
417417
}
418418

419419
TEST(BufferTest, Vector) {
420-
char *buffer = (char *)malloc(4096);
420+
char *buffer = (char *)calloc(1, 4096);
421421
PayloadBuffer *pb = new (buffer) PayloadBuffer(4096);
422422

423423
// Allocate space for a message containing the VectorHeader.
@@ -439,7 +439,7 @@ TEST(BufferTest, Vector) {
439439
}
440440

441441
TEST(BufferTest, VectorExpand) {
442-
char *buffer = (char *)malloc(4096);
442+
char *buffer = (char *)calloc(1, 4096);
443443
PayloadBuffer *pb = new (buffer) PayloadBuffer(4096);
444444

445445
// Allocate space for a message containing the VectorHeader.
@@ -466,7 +466,7 @@ TEST(BufferTest, VectorExpand) {
466466
}
467467

468468
TEST(BufferTest, VectorExpandMore) {
469-
char *buffer = (char *)malloc(4096);
469+
char *buffer = (char *)calloc(1, 4096);
470470
PayloadBuffer *pb = new (buffer) PayloadBuffer(4096);
471471

472472
// Allocate space for a message containing the VectorHeader.
@@ -495,7 +495,7 @@ TEST(BufferTest, VectorExpandMore) {
495495
}
496496

497497
TEST(BufferTest, Resizeable) {
498-
char *buffer = (char *)malloc(512);
498+
char *buffer = (char *)calloc(1, 512);
499499
bool resized = false;
500500
PayloadBuffer *pb = new (buffer) PayloadBuffer(
501501
256, [&resized](PayloadBuffer **p, size_t, size_t new_size) {
@@ -537,7 +537,11 @@ TEST(BufferTest, Resizeable) {
537537
toolbelt::Hexdump(pb, pb->hwm);
538538

539539
// Don't free 'buffer' as it has already been freed by the call to realloc.
540-
delete pb;
540+
// pb was constructed via placement-new on a malloc/realloc'd buffer, so we
541+
// must invoke the destructor explicitly and then free() the storage rather
542+
// than calling operator delete (which would be an alloc-dealloc mismatch).
543+
pb->~PayloadBuffer();
544+
free(pb);
541545
}
542546

543547
int main(int argc, char **argv) {

‎toolbelt/pipe_test.cc‎

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "co/coroutine.h"
77
#include "pipe.h"
88
#include <gtest/gtest.h>
9+
#include <string_view>
910

1011
#define VAR(a) a##__COUNTER__
1112
#define EVAL_AND_ASSERT_OK(expr) EVAL_AND_ASSERT_OK2(VAR(r_), expr)
@@ -69,7 +70,7 @@ TEST(PipeTest, CoroutinePipeReadAndWrite) {
6970
auto r = pipe.Read(buffer, 5, c);
7071
ASSERT_OK(r);
7172
ASSERT_EQ(*r, 5);
72-
ASSERT_STREQ(buffer, "Hello");
73+
ASSERT_EQ(std::string_view(buffer, *r), "Hello");
7374
});
7475
co::Coroutine writer(scheduler, [&pipe](co::Coroutine *c) {
7576
const char *msg = "Hello";
@@ -92,7 +93,7 @@ TEST(PipeTest, CoroutinePipeReadAndWriteNonblocking) {
9293
auto r = pipe.Read(buffer, 5, c);
9394
ASSERT_OK(r);
9495
ASSERT_EQ(*r, 5);
95-
ASSERT_STREQ(buffer, "Hello");
96+
ASSERT_EQ(std::string_view(buffer, *r), "Hello");
9697
});
9798
co::Coroutine writer(scheduler, [&pipe](co::Coroutine *c) {
9899
const char *msg = "Hello";
@@ -158,7 +159,7 @@ TEST(PipeTest, CoroutineFullPipeReadAndWrite) {
158159
auto r = pipe.Read(buffer, kMessageSize, c);
159160
ASSERT_OK(r);
160161
ASSERT_EQ(*r, kMessageSize);
161-
ASSERT_STREQ(buffer, "1234");
162+
ASSERT_EQ(std::string_view(buffer, *r), "1234");
162163
}
163164
});
164165
co::Coroutine writer(scheduler, [&pipe, kMessageSize](co::Coroutine *c) {
@@ -174,6 +175,10 @@ TEST(PipeTest, CoroutineFullPipeReadAndWrite) {
174175
}
175176

176177
TEST(PipeTest, CoroutineOverFullPipeReadAndWrite) {
178+
#if defined(THREAD_SANITIZER)
179+
GTEST_SKIP() << "TSan + many coroutine fiber switches in this stress test "
180+
"trips a known TSan runtime issue (nested DEADLYSIGNAL).";
181+
#endif
177182
co::CoroutineScheduler scheduler;
178183
auto p = toolbelt::Pipe::Create();
179184
ASSERT_OK(p);
@@ -189,7 +194,7 @@ TEST(PipeTest, CoroutineOverFullPipeReadAndWrite) {
189194
auto r = pipe.Read(buffer, kMessageSize, c);
190195
ASSERT_OK(r);
191196
ASSERT_EQ(*r, kMessageSize);
192-
ASSERT_STREQ(buffer, "1234");
197+
ASSERT_EQ(std::string_view(buffer, *r), "1234");
193198
}
194199
});
195200
co::Coroutine writer(scheduler, [&pipe, kMessageSize](co::Coroutine *c) {
@@ -221,7 +226,7 @@ TEST(PipeTest, CoroutineFullPipeReadAndWriteNonblocking) {
221226
auto r = pipe.Read(buffer, kMessageSize, c);
222227
ASSERT_OK(r);
223228
ASSERT_EQ(*r, kMessageSize);
224-
ASSERT_STREQ(buffer, "1234");
229+
ASSERT_EQ(std::string_view(buffer, *r), "1234");
225230
}
226231
});
227232
co::Coroutine writer(scheduler, [&pipe, kMessageSize](co::Coroutine *c) {
@@ -237,6 +242,10 @@ TEST(PipeTest, CoroutineFullPipeReadAndWriteNonblocking) {
237242
}
238243

239244
TEST(PipeTest, CoroutineOverFullPipeReadAndWriteNonblocking) {
245+
#if defined(THREAD_SANITIZER)
246+
GTEST_SKIP() << "TSan + many coroutine fiber switches in this stress test "
247+
"trips a known TSan runtime issue (nested DEADLYSIGNAL).";
248+
#endif
240249
co::CoroutineScheduler scheduler;
241250
auto p = toolbelt::Pipe::Create();
242251
ASSERT_OK(p);
@@ -253,7 +262,7 @@ TEST(PipeTest, CoroutineOverFullPipeReadAndWriteNonblocking) {
253262
auto r = pipe.Read(buffer, kMessageSize, c);
254263
ASSERT_OK(r);
255264
ASSERT_EQ(*r, kMessageSize);
256-
ASSERT_STREQ(buffer, "1234");
265+
ASSERT_EQ(std::string_view(buffer, *r), "1234");
257266
}
258267
});
259268
co::Coroutine writer(scheduler, [&pipe, kMessageSize](co::Coroutine *c) {
@@ -279,12 +288,12 @@ TEST(PipeTest, CoroutinePipeReadAndMultiWrite) {
279288
auto r = pipe.Read(buffer, 5, c);
280289
ASSERT_OK(r);
281290
ASSERT_EQ(*r, 5);
282-
ASSERT_STREQ(buffer, "12345");
291+
ASSERT_EQ(std::string_view(buffer, *r), "12345");
283292

284293
r = pipe.Read(buffer, 5, c);
285294
ASSERT_OK(r);
286295
ASSERT_EQ(*r, 5);
287-
ASSERT_STREQ(buffer, "54321");
296+
ASSERT_EQ(std::string_view(buffer, *r), "54321");
288297
});
289298

290299
co::Coroutine writer1(scheduler, [&pipe](co::Coroutine *c) {
@@ -304,6 +313,10 @@ TEST(PipeTest, CoroutinePipeReadAndMultiWrite) {
304313
}
305314

306315
TEST(PipeTest, CoroutineOverFullPipeReadAndWriteMultiwriter) {
316+
#if defined(THREAD_SANITIZER)
317+
GTEST_SKIP() << "TSan + many coroutine fiber switches in this stress test "
318+
"trips a known TSan runtime issue (nested DEADLYSIGNAL).";
319+
#endif
307320
co::CoroutineScheduler scheduler;
308321
auto p = toolbelt::Pipe::Create();
309322
ASSERT_OK(p);
@@ -320,7 +333,8 @@ TEST(PipeTest, CoroutineOverFullPipeReadAndWriteMultiwriter) {
320333
ASSERT_OK(r);
321334
ASSERT_EQ(*r, kMessageSize);
322335
// Can be in either order.
323-
bool ok = (strcmp(buffer, "1234") == 0) || (strcmp(buffer, "4321") == 0);
336+
std::string_view got(buffer, *r);
337+
bool ok = got == "1234" || got == "4321";
324338
ASSERT_TRUE(ok);
325339
}
326340
});
@@ -347,6 +361,10 @@ TEST(PipeTest, CoroutineOverFullPipeReadAndWriteMultiwriter) {
347361

348362

349363
TEST(PipeTest, CoroutineOverFullPipeReadAndWriteMultiwriterNonblocking) {
364+
#if defined(THREAD_SANITIZER)
365+
GTEST_SKIP() << "TSan + many coroutine fiber switches in this stress test "
366+
"trips a known TSan runtime issue (nested DEADLYSIGNAL).";
367+
#endif
350368
co::CoroutineScheduler scheduler;
351369
auto p = toolbelt::Pipe::Create();
352370
ASSERT_OK(p);
@@ -364,7 +382,8 @@ TEST(PipeTest, CoroutineOverFullPipeReadAndWriteMultiwriterNonblocking) {
364382
ASSERT_OK(r);
365383
ASSERT_EQ(*r, kMessageSize);
366384
// Can be in either order.
367-
bool ok = (strcmp(buffer, "1234") == 0) || (strcmp(buffer, "4321") == 0);
385+
std::string_view got(buffer, *r);
386+
bool ok = got == "1234" || got == "4321";
368387
ASSERT_TRUE(ok);
369388
}
370389
});

‎toolbelt/sockets_test.cc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,11 @@ TEST(SocketsTest, UDPSocket_SendAndReceiveUnicast) {
515515
}
516516

517517
TEST(SocketsTest, UDPSocket_SendAndReceiveBroadcast) {
518+
#if defined(__APPLE__)
519+
GTEST_SKIP() << "UDP broadcast to 255.255.255.255 over loopback is not "
520+
"permitted in the GitHub Actions macOS runner network "
521+
"sandbox; skip on macOS.";
522+
#endif
518523
UnusedPort port;
519524
auto sender = toolbelt::UDPSocket();
520525
auto Receiver = toolbelt::UDPSocket();
@@ -533,6 +538,11 @@ TEST(SocketsTest, UDPSocket_SendAndReceiveBroadcast) {
533538
}
534539

535540
TEST(SocketsTest, UDPSocket_SendAndReceiveMulticast) {
541+
#if defined(__APPLE__)
542+
GTEST_SKIP() << "UDP multicast over loopback is not reliably available in "
543+
"the GitHub Actions macOS runner network sandbox; skip on "
544+
"macOS.";
545+
#endif
536546
UnusedPort port;
537547
std::string multicast_ip = "224.0.0.205";
538548
toolbelt::InetAddress multicast_address(multicast_ip, port);

0 commit comments

Comments
 (0)