From 78d0b3c79788cf5edfc39f38c18b00f2b2d1ee23 Mon Sep 17 00:00:00 2001 From: Dmitriy Musatkin Date: Tue, 3 Oct 2023 08:52:05 -0700 Subject: [PATCH] undo san annotation removal --- source/allocator_sba.c | 2 +- tests/alloc_test.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/allocator_sba.c b/source/allocator_sba.c index 24b47ec45..ab1e833f0 100644 --- a/source/allocator_sba.c +++ b/source/allocator_sba.c @@ -406,7 +406,7 @@ static void *s_sba_alloc(struct small_block_allocator *sba, size_t size) { return aws_mem_acquire(sba->allocator, size); } -static void s_sba_free(struct small_block_allocator *sba, void *addr) { +AWS_SUPPRESS_ASAN AWS_SUPPRESS_TSAN static void s_sba_free(struct small_block_allocator *sba, void *addr) { if (!addr) { return; } diff --git a/tests/alloc_test.c b/tests/alloc_test.c index 21f6d8c3c..be601c192 100644 --- a/tests/alloc_test.c +++ b/tests/alloc_test.c @@ -186,7 +186,7 @@ static int s_sba_threaded_allocs_and_frees(struct aws_allocator *allocator, void } AWS_TEST_CASE(sba_threaded_allocs_and_frees, s_sba_threaded_allocs_and_frees) -static void s_sba_threaded_realloc_worker(void *user_data) { +static void s_threaded_realloc_worker(void *user_data) { struct allocator_thread_test_data *thread_data = user_data; struct aws_allocator *test_allocator = thread_data->test_allocator; void *alloc = NULL; @@ -215,7 +215,7 @@ static int s_sba_threaded_reallocs(struct aws_allocator *allocator, void *ctx) { struct aws_allocator *sba = aws_small_block_allocator_new(allocator, true); - s_thread_test(allocator, s_sba_threaded_realloc_worker, sba); + s_thread_test(allocator, s_threaded_realloc_worker, sba); aws_small_block_allocator_destroy(sba); @@ -331,7 +331,7 @@ static int s_default_threaded_reallocs(struct aws_allocator *allocator, void *ct (void)ctx; srand(15); - s_thread_test(allocator, s_sba_threaded_realloc_worker, allocator); + s_thread_test(allocator, s_threaded_realloc_worker, allocator); return 0; }