Okaaay, fix another function broken on Mac

Author: multiplemonomials

RTXOff/CMakeLists.txt

@@ -95,6 +95,12 @@ else()
 	if(PTHREAD_SETNAME_NP_WORKS)
 		target_compile_definitions(rtxoff PRIVATE HAVE_PTHREAD_SETNAME_NP)
 	endif()
+
+	# tell code to use more limited timing functions available on OS X
+	if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+		target_compile_definitions(rtxoff PRIVATE USE_MAC_TIME)
+	endif()
+
 endif()
 
 # manually apply mbed configs

RTXOff/ThreadDispatcher.cpp

@@ -54,13 +54,17 @@ ThreadDispatcher::ThreadDispatcher()
 
     pthread_mutexattr_destroy(&recursiveAttr);
 
+#ifdef USE_MAC_TIME
+        pthread_cond_init(&kernelModeCondVar, nullptr);
+#else
     // initialize kernel mode cond var
     // make sure that the condition variable is using the monotonic clock
     pthread_condattr_t monotonicClockAttr;
     pthread_condattr_init(&monotonicClockAttr);
     pthread_condattr_setclock(&monotonicClockAttr, CLOCK_MONOTONIC); // sadly CLOCK_PROCESS_CPUTIME_ID is not supported here
 
     pthread_cond_init(&kernelModeCondVar, &monotonicClockAttr);
+#endif
 
     pthread_condattr_destroy(&monotonicClockAttr);
 }

tests/events/queue/main.cpp

@@ -302,16 +302,16 @@ void time_left_test()
     EventQueue queue(TEST_EQUEUE_SIZE);
 
     // Enque check events
-    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));
+    TEST_ASSERT(queue.call_in(500ms, check_time_left, &queue, 0, 1000 - 500));
+    TEST_ASSERT(queue.call_in(2000ms, check_time_left, &queue, 1, 2000 - 2000));
 
     // Enque events to be checked
     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]);
 
-    queue.dispatch(300);
+    queue.dispatch(3000);
 
     // Ensure check was called
     TEST_ASSERT(touched);