From 0c001d5c7fd4c6c5d9ceeb55ba5fac1780b441af Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 18 Aug 2022 16:57:17 -0400 Subject: Fix or remove non-portable features in thread API Thread function return values are inconsistent between nearly every threading API out there. So, just ignore them entirely, and provide a typedef and sentinel value so user code can be portable. --- test/test_ring.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'test/test_ring.c') diff --git a/test/test_ring.c b/test/test_ring.c index 79aa0f1..8016910 100644 --- a/test/test_ring.c +++ b/test/test_ring.c @@ -43,7 +43,8 @@ cmp_msg(const int* const msg1, const int* const msg2) return 1; } -static void* +ZIX_THREAD_FUNC +static ZixThreadResult reader(void* ZIX_UNUSED(arg)) { printf("Reader starting\n"); @@ -63,10 +64,11 @@ reader(void* ZIX_UNUSED(arg)) } printf("Reader finished\n"); - return NULL; + return ZIX_THREAD_RESULT; } -static void* +ZIX_THREAD_FUNC +static ZixThreadResult writer(void* ZIX_UNUSED(arg)) { printf("Writer starting\n"); @@ -82,7 +84,7 @@ writer(void* ZIX_UNUSED(arg)) } printf("Writer finished\n"); - return NULL; + return ZIX_THREAD_RESULT; } static int @@ -108,8 +110,8 @@ test_ring(const unsigned size) ZixThread writer_thread; // NOLINT assert(!zix_thread_create(&writer_thread, MSG_SIZE * 4UL, writer, NULL)); - zix_thread_join(reader_thread, NULL); - zix_thread_join(writer_thread, NULL); + assert(!zix_thread_join(reader_thread)); + assert(!zix_thread_join(writer_thread)); assert(!read_error); assert(ring); -- cgit v1.2.1