fix(tests): More generic multi-thread

This uses a combination of CMake and macros to detect and provide more
generic code.

Author: SpacingBat3

test/CMakeLists.txt

@@ -7,7 +7,7 @@ file(GLOB_RECURSE "${OLD_PROJECT_NAME}_TESTS"
   LIST_DIRECTORIES false
   CONFIGURE_DEPENDS
   RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-  **/*.c
+  vec/**/*.c
 )
 
 list(JOIN "${OLD_PROJECT_NAME}_TESTS" " " testrunner_str)
@@ -20,6 +20,7 @@ create_test_sourcelist(
 # Additional libraries
 add_subdirectory("lib/")
 
+# Test runner
 add_executable("${OLD_PROJECT_NAME}TestRunner" TestRunner.c ${${OLD_PROJECT_NAME}_TEST_SRC})
 add_executable("${OLD_PROJECT_NAME}::TestRunner" ALIAS "${OLD_PROJECT_NAME}TestRunner")
 add_executable("${PROJECT_NAME}::Runner" ALIAS "${OLD_PROJECT_NAME}TestRunner")
@@ -28,6 +29,46 @@ target_include_directories("${OLD_PROJECT_NAME}TestRunner" PRIVATE "include/")
 set_target_properties("${OLD_PROJECT_NAME}TestRunner" PROPERTIES
   CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/test")
 
+# Check multithreading
+if(NOT DEFINED TRY_STDC_THREADS)
+  message(CHECK_START "Test if <threads.h> is compiling")
+  try_compile(TRY_STDC_THREADS
+    SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/compiler/stdc_threads.c"
+  )
+  if(TRY_STDC_THREADS)
+    message(CHECK_PASS "Success")
+  else()
+    message(CHECK_FAIL "Failure")
+  endif()
+endif()
+
+if(TRY_STDC_THREADS)
+  set(THREAD_IMPL "C")
+  set(THREAD_IMPL_ENUM 1)
+else(TRY_STDC_THREADS)
+  #POSIX
+  set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+  find_package(Threads)
+  if(CMAKE_USE_PTHREADS_INIT AND NOT DEFINED TRY_POSIX_THREADS)
+    try_compile(TRY_POSIX_THREADS
+      SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/compiler/stdc_threads.c"
+      LINK_LIBRARIES Threads::Threads
+    )
+  endif(CMAKE_USE_PTHREADS_INIT AND NOT DEFINED TRY_POSIX_THREADS)
+  if(TRY_POSIX_THREADS)
+    set(THREAD_IMPL "POSIX")
+    set(THREAD_IMPL_ENUM 2)
+    target_link_libraries("${OLD_PROJECT_NAME}TestRunner" PRIVATE Threads::Threads)
+  else(TRY_POSIX_THREADS)
+    set(THREAD_IMPL "<none>")
+    set(THREAD_IMPL_ENUM 0)
+  endif(TRY_POSIX_THREADS)
+endif(TRY_STDC_THREADS)
+
+message(STATUS "Threads implementation: ${THREAD_IMPL}")
+target_compile_definitions("${OLD_PROJECT_NAME}TestRunner"
+  PRIVATE "DETECTED_THREAD_IMPL=${THREAD_IMPL_ENUM}")
+
 foreach(test IN LISTS "${OLD_PROJECT_NAME}_TESTS")
   get_filename_component(TName "${test}" NAME_WE)
   get_filename_component(TPath "${test}" DIRECTORY)

test/compiler/posix_threads.c

@@ -0,0 +1,15 @@
+#include <pthread.h>
+#include <assert.h>
+
+void* thr_fun(void* pass) {
+  return pass;
+}
+
+int main() {
+  pthread_t thr;
+  pthread_create(&thr, NULL, thr_fun, (void*) 0xADD);
+  void* var=NULL;
+  pthread_join(thr, &var);
+  assert(var==0xADD);
+  return 0;
+}

test/compiler/stdc_threads.c

@@ -0,0 +1,15 @@
+#include <threads.h>
+#include <assert.h>
+
+int thr_fun(void*_) {
+  return 0xADD;
+}
+
+int main() {
+  thrd_t thr;
+  thrd_create(&thr, thr_fun, NULL);
+  int var;
+  thrd_join(thr, &var);
+  assert(var==0xADD);
+  return 0;
+}

test/vec/api/should_push_many.c

@@ -17,7 +17,6 @@ it_should(push_many) {
   test_if(vec.len == vec.reservd && vec.reservd == countof(A))
     goto exit;
   for(size_t i = 0; i < countof(A); ++i) {
-    char tescase = -1;
     test_if(yavl_vec_get(&vec, i, &testcase) == YAVL_VEC_RES_OK)
       break;
     test_if(testcase == A[i]) {

test/vec/perf/should_push_not_slower_than_cpp.c

@@ -6,8 +6,20 @@
 #include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
-#ifndef __STDC_NO_THREADS__
+
+#if !defined(__STDC_NO_THREADS__) && DETECTED_THREAD_IMPL == 1 // C
 #include <threads.h>
+#define THREADS_INCLUDED 1
+#define THREAD_RET int
+#define THREAD_RET_OK thrd_success
+#elif DETECTED_THREAD_IMPL == 2 // POSIX
+#include <pthread.h>
+#define PTHREAD_INCLUDED 1
+#define THREAD_RET void*
+#define THREAD_RET_OK NULL
+#else
+#define THREAD_RET int
+#define THREAD_RET_OK 0
 #endif
 
 static size_t default_reservd = 0;
@@ -18,7 +30,7 @@ typedef struct {
   size_t test_data_len;
 } bench_t;
 
-static int bench_cpp(void* userdata) {
+static THREAD_RET bench_cpp(void* userdata) {
   bench_t *const data = userdata;
   struct timespec t[2] = {};
   cpp_vector(char) *cpp = NULL;
@@ -37,14 +49,10 @@ static int bench_cpp(void* userdata) {
     if(b)
       data->res_time += (((double)t[1].tv_nsec)/1e9)+(t[1].tv_sec);
   }
-  #ifndef __STDC_NO_THREADS__
-  return thrd_success;
-  #else
-  return 0;
-  #endif
+  return THREAD_RET_OK;
 }
 
-static int bench_yavl(void* userdata) {
+static THREAD_RET bench_yavl(void* userdata) {
   bench_t *const data = userdata;
   struct timespec t[2] = {};
   yavl_vec_t yavl = YAVL_VEC_T_ALLOCATOR;
@@ -62,14 +70,10 @@ static int bench_yavl(void* userdata) {
     if(b)
       data->res_time += ((double)t[1].tv_nsec/1e9)+(t[1].tv_sec);
   }
-  #ifndef __STDC_NO_THREADS__
-  return thrd_success;
-  #else
-  return 0;
-  #endif
+  return THREAD_RET_OK;
 }
 
-static int bench_inline(void* userdata) {
+static THREAD_RET bench_inline(void* userdata) {
   bench_t *const data = userdata;
   struct timespec t[2] = {};
   data->res_time=0;
@@ -98,11 +102,7 @@ static int bench_inline(void* userdata) {
     if(b)
       data->res_time += ((double)t[1].tv_nsec/1e9)+(t[1].tv_sec);
   }
-  #ifndef __STDC_NO_THREADS__
-  return thrd_success;
-  #else
-  return 0;
-  #endif
+  return THREAD_RET_OK;
 }
 
 it_should(push_not_slower_than_cpp) {
@@ -129,9 +129,12 @@ it_should(push_not_slower_than_cpp) {
     {.test_data=tdata, .test_data_len=tdata_len},
     {.test_data=tdata, .test_data_len=tdata_len},
   };
-  #ifndef __STDC_NO_THREADS__
+  #if THREADS_INCLUDED
   thrd_t thr[3];
   thrd_start_t funs[3] = { bench_yavl,bench_cpp,bench_inline };
+  #elif PTHREAD_INCLUDED
+  pthread_t thr[3];
+  typeof(&bench_yavl) funs[3] = { bench_yavl,bench_cpp,bench_inline };
   #else
   typeof(&bench_yavl) funs[3] = { bench_yavl,bench_cpp,bench_inline };
   #endif
@@ -145,19 +148,27 @@ it_should(push_not_slower_than_cpp) {
     ind[j] = temp;
   }
 
-  #ifndef __STDC_NO_THREADS__
+  #if THREADS_INCLUDED || PTHREAD_INCLUDED
   printf("Running benchmarks in their own threads...\n");
   // Random thread creation, ordered thread collection
   for(size_t i=0;i<sizeof(thr)/sizeof(thr[0]);++i){
     printf(" * Starting \"%s\"...\n",strs[ind[i]]);
+    #if THREADS_INCLUDED
     thrd_create(&thr[ind[i]], funs[ind[i]], &bdata[ind[i]]);
+    #else
+    pthread_create(&thr[ind[i]], NULL, funs[ind[i]], &bdata[ind[i]]);
+    #endif
   }
   for(size_t i=0;i<sizeof(thr)/sizeof(thr[0]);++i){
+    #if THREADS_INCLUDED
     thrd_join(thr[i], NULL);
+    #else
+    pthread_join(thr[i], NULL);
+    #endif
     printf(" * \"%s\" finished! \n",strs[i]);
   }
   #else
-  printf("Running in single thread only (no standard threads impl)\n");
+  printf("Running in single thread only (no supported threads impl)\n");
   for(size_t i=0;i<sizeof(funs)/sizeof(funs[0]);++i){
     printf(" * Running \"%s\"...\n",strs[ind[i]]);
     funs[ind[i]](&bdata[ind[i]]);