Merge pull request #7874 from ARMmbed/release-candidate

Release candidate for mbed-os-5.9.6

Author: 0xc0170

TESTS/mbed_drivers/timeout/timeout_tests.h

@@ -81,10 +81,10 @@ void test_single_call(void)
     int32_t sem_slots = sem.wait(0);
     TEST_ASSERT_EQUAL(0, sem_slots);
 
-    sem_slots = sem.wait(TEST_DELAY_MS + 1);
+    sem_slots = sem.wait(TEST_DELAY_MS + 2);
     TEST_ASSERT_EQUAL(1, sem_slots);
 
-    sem_slots = sem.wait(TEST_DELAY_MS + 1);
+    sem_slots = sem.wait(TEST_DELAY_MS + 2);
     TEST_ASSERT_EQUAL(0, sem_slots);
 
     timeout.detach();
@@ -114,7 +114,7 @@ void test_cancel(void)
     TEST_ASSERT_EQUAL(0, sem_slots);
     timeout.detach();
 
-    sem_slots = sem.wait(TEST_DELAY_MS + 1);
+    sem_slots = sem.wait(TEST_DELAY_MS + 2);
     TEST_ASSERT_EQUAL(0, sem_slots);
 }
 
@@ -147,7 +147,7 @@ void test_override(void)
     TEST_ASSERT_EQUAL(0, sem_slots);
     timeout.attach_callback(mbed::callback(sem_callback, &sem2), 2.0f * TEST_DELAY_US);
 
-    sem_slots = sem2.wait(2 * TEST_DELAY_MS + 1);
+    sem_slots = sem2.wait(2 * TEST_DELAY_MS + 2);
     TEST_ASSERT_EQUAL(1, sem_slots);
     sem_slots = sem1.wait(0);
     TEST_ASSERT_EQUAL(0, sem_slots);
@@ -177,7 +177,7 @@ void test_multiple(void)
     for (size_t i = 0; i < NUM_TIMEOUTS; i++) {
         timeouts[i].attach_callback(mbed::callback(cnt_callback, &callback_count), TEST_DELAY_US);
     }
-    Thread::wait(TEST_DELAY_MS + 1);
+    Thread::wait(TEST_DELAY_MS + 2);
     TEST_ASSERT_EQUAL(NUM_TIMEOUTS, callback_count);
 }
 

TESTS/mbed_drivers/timer/main.cpp

@@ -65,6 +65,20 @@ static Timer *p_timer = NULL;
  */
 static uint32_t curr_ticker_ticks_val;
 
+
+/* Replacement for generic wait functions to avoid invoking OS scheduling stuff. */
+void busy_wait_us(int us)
+{
+    const ticker_data_t *const ticker = get_us_ticker_data();
+    uint32_t start = ticker_read(ticker);
+    while ((ticker_read(ticker) - start) < (uint32_t)us);
+}
+
+void busy_wait_ms(int ms)
+{
+    busy_wait_us(ms * US_PER_MSEC);
+}
+
 /* User ticker interface function. */
 static void stub_interface_init()
 {
@@ -196,7 +210,7 @@ void test_timer_creation_os_ticker()
 
     /* Wait 10 ms.
      * After that operation timer read routines should still return 0. */
-    wait_ms(10);
+    busy_wait_ms(10);
 
     /* Check results. */
     TEST_ASSERT_EQUAL_FLOAT(0, p_timer->read());
@@ -406,7 +420,7 @@ void test_timer_time_accumulation_os_ticker()
     p_timer->start();
 
     /* Wait 10 ms. */
-    wait_ms(10);
+    busy_wait_ms(10);
 
     /* Stop the timer. */
     p_timer->stop();
@@ -420,15 +434,15 @@ void test_timer_time_accumulation_os_ticker()
     /* Wait 50 ms - this is done to show that time elapsed when
      * the timer is stopped does not have influence on the
      * timer counted time. */
-    wait_ms(50);
+    busy_wait_ms(50);
 
     /* ------ */
 
     /* Start the timer. */
     p_timer->start();
 
     /* Wait 20 ms. */
-    wait_ms(20);
+    busy_wait_ms(20);
 
     /* Stop the timer. */
     p_timer->stop();
@@ -449,7 +463,7 @@ void test_timer_time_accumulation_os_ticker()
     p_timer->start();
 
     /* Wait 30 ms. */
-    wait_ms(30);
+    busy_wait_ms(30);
 
     /* Stop the timer. */
     p_timer->stop();
@@ -463,15 +477,15 @@ void test_timer_time_accumulation_os_ticker()
     /* Wait 50 ms - this is done to show that time elapsed when
      * the timer is stopped does not have influence on the
      * timer time. */
-    wait_ms(50);
+    busy_wait_ms(50);
 
     /* ------ */
 
     /* Start the timer. */
     p_timer->start();
 
     /* Wait 1 sec. */
-    wait_ms(1000);
+    busy_wait_ms(1000);
 
     /* Stop the timer. */
     p_timer->stop();
@@ -500,7 +514,7 @@ void test_timer_reset_os_ticker()
     p_timer->start();
 
     /* Wait 10 ms. */
-    wait_ms(10);
+    busy_wait_ms(10);
 
     /* Stop the timer. */
     p_timer->stop();
@@ -518,7 +532,7 @@ void test_timer_reset_os_ticker()
     p_timer->start();
 
     /* Wait 20 ms. */
-    wait_ms(20);
+    busy_wait_ms(20);
 
     /* Stop the timer. */
     p_timer->stop();
@@ -596,13 +610,13 @@ void test_timer_start_started_timer_os_ticker()
     p_timer->start();
 
     /* Wait 10 ms. */
-    wait_ms(10);
+    busy_wait_ms(10);
 
     /* Now start timer again. */
     p_timer->start();
 
     /* Wait 20 ms. */
-    wait_ms(20);
+    busy_wait_ms(20);
 
     /* Stop the timer. */
     p_timer->stop();
@@ -666,7 +680,7 @@ void test_timer_float_operator_os_ticker()
     p_timer->start();
 
     /* Wait 10 ms. */
-    wait_ms(10);
+    busy_wait_ms(10);
 
     /* Stop the timer. */
     p_timer->stop();
@@ -721,7 +735,7 @@ void test_timer_time_measurement()
     p_timer->start();
 
     /* Wait <wait_val_us> us. */
-    wait_us(wait_val_us);
+    busy_wait_us(wait_val_us);
 
     /* Stop the timer. */
     p_timer->stop();