Fix equeue test failure, add test for pthread_setname_np

Author: multiplemonomials

RTXOff/CMakeLists.txt

@@ -70,20 +70,31 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
 else()
 	target_compile_definitions(rtxoff PUBLIC USE_WINTHREAD=0 _GNU_SOURCE=1)
 
-	# check if the nonstandard pthread_setname_np() function exists
+	# check for a thread yield function
 	set(CMAKE_REQUIRED_LIBRARIES Threads::Threads)
-	check_all_functions(pthread_setname_np pthread_yield sched_yield)
-
-	if(HAVE_PTHREAD_SETNAME_NP)
-		target_compile_definitions(rtxoff PRIVATE HAVE_PTHREAD_SETNAME_NP)
-	endif()
+	check_all_functions(pthread_yield sched_yield)
 
 	if(NOT (HAVE_PTHREAD_YIELD OR HAVE_SCHED_YIELD))
 		message(FATAL_ERROR "Your system does not provide pthread_yield() or sched_yield().  RTXOff cannot build.")
 	endif()
 	if(HAVE_PTHREAD_YIELD)
 		target_compile_definitions(rtxoff PRIVATE HAVE_PTHREAD_YIELD)
 	endif()
+
+	# Check for a linux API pthread_setname_np (as opposed to the Mac version that works differently).
+	# The situation is summarized here: https://stackoverflow.com/questions/2369738/how-to-set-the-name-of-a-thread-in-linux-pthreads/7989973#7989973
+	include(CheckCSourceCompiles)
+	check_c_source_compiles(
+		"#include <pthread.h>
+		int main(int argc, char** argv)
+		{
+		    pthread_setname_np(pthread_self(), \"TestThread\");
+		}"
+		PTHREAD_SETNAME_NP_WORKS)
+
+	if(PTHREAD_SETNAME_NP_WORKS)
+		target_compile_definitions(rtxoff PRIVATE HAVE_PTHREAD_SETNAME_NP)
+	endif()
 endif()
 
 # manually apply mbed configs

tests/events/queue/main.cpp

@@ -302,12 +302,12 @@ void time_left_test()
     EventQueue queue(TEST_EQUEUE_SIZE);
 
     // Enque check events
-    TEST_ASSERT(queue.call_in(50ms, check_time_left, &queue, 0, 100 - 50));
-    TEST_ASSERT(queue.call_in(200ms, check_time_left, &queue, 1, 200 - 200));
+    TEST_ASSERT(queue.call_in(500ms, check_time_left, &queue, 0, 100 - 500));
+    TEST_ASSERT(queue.call_in(2000ms, check_time_left, &queue, 1, 200 - 2000));
 
     // Enque events to be checked
-    timeleft_events[0] = queue.call_in(100ms, time_left, &queue, 0);
-    timeleft_events[1] = queue.call_in(200ms, time_left, &queue, 1);
+    timeleft_events[0] = queue.call_in(1000ms, time_left, &queue, 0);
+    timeleft_events[1] = queue.call_in(2000ms, time_left, &queue, 1);
     TEST_ASSERT(timeleft_events[0]);
     TEST_ASSERT(timeleft_events[1]);
 
@@ -500,6 +500,13 @@ void static_events_queue_test()
     TEST_ASSERT_EQUAL(6, test2.counter);
     TEST_ASSERT_EQUAL(30, test3.counter);
     TEST_ASSERT_EQUAL(15, test4.counter);
+
+    // cancel all events to prevent assertion failure when program shuts down
+    ue0.cancel();
+    ue1.cancel();
+    ue2.cancel();
+    ue3.cancel();
+    ue4.cancel();
 }
 
 // Test setup