Merge pull request #12425 from kjbracey-arm/chrono

C++ Chrono support

Author: 0xc0170

TESTS/mbed_drivers/timer/main.cpp

@@ -41,7 +41,7 @@ class TestTimerEvent: public TimerEvent {
 
 public:
     TestTimerEvent() :
-        TimerEvent(), sem(0, 1)
+        TimerEvent(get_us_ticker_data()), sem(0, 1)
     {
 
         sleep_manager_lock_deep_sleep();

TESTS/mbed_drivers/timerevent/main.cpp

@@ -25,23 +25,25 @@
 #include "rtc_test.h"
 
 #include "mbed.h"
+#include "drivers/RealTimeClock.h"
 #include "rtc_api.h"
+#include <type_traits>
+#include <mstd_atomic>
 
 using namespace utest::v1;
+using namespace std::chrono;
 
-static const uint32_t WAIT_TIME = 4;
-static const uint32_t WAIT_TOLERANCE = 1;
+static constexpr auto WAIT_TIME = 4s;
+static constexpr auto WAIT_TOLERANCE = 1s;
 
-#define US_PER_SEC 1000000
-#define ACCURACY_FACTOR 10
-
-static const uint32_t DELAY_4S = 4;
-static const uint32_t DELAY_10S = 10;
-static const uint32_t RTC_TOLERANCE = 1;
-static const uint32_t TOLERANCE_ACCURACY_US = (DELAY_10S *US_PER_SEC / ACCURACY_FACTOR);
+#define TEST_ASSERT_DURATION_WITHIN(delta, expected, actual) \
+    do { \
+        using ct = std::common_type_t<decltype(delta), decltype(expected), decltype(actual)>; \
+        TEST_ASSERT_INT_WITHIN(ct(delta).count(), ct(expected).count(), ct(actual).count()); \
+    } while (0)
 
 #if DEVICE_LPTICKER
-volatile bool expired;
+mstd::atomic_bool expired;
 
 void set_flag_true(void)
 {
@@ -53,7 +55,7 @@ void set_flag_true(void)
 void rtc_sleep_test_support(bool deepsleep_mode)
 {
     LowPowerTimeout timeout;
-    const uint32_t start = 100;
+    const auto start = RealTimeClock::time_point(100s);
     expired = false;
 
     /*
@@ -63,46 +65,46 @@ void rtc_sleep_test_support(bool deepsleep_mode)
      * hardware buffers are empty. However, such an API does not exist now,
      * so we'll use the ThisThread::sleep_for() function for now.
      */
-    ThisThread::sleep_for(10);
+    ThisThread::sleep_for(10ms);
 
-    rtc_init();
+    RealTimeClock::init();
 
     if (deepsleep_mode == false) {
         sleep_manager_lock_deep_sleep();
     }
 
-    rtc_write(start);
+    RealTimeClock::write(start);
 
-    timeout.attach(set_flag_true, DELAY_4S);
+    timeout.attach(set_flag_true, 4s);
 
     TEST_ASSERT(sleep_manager_can_deep_sleep_test_check() == deepsleep_mode);
 
     while (!expired) {
         sleep();
     }
 
-    const uint32_t stop = rtc_read();
+    const auto stop = RealTimeClock::now();
 
-    TEST_ASSERT_UINT32_WITHIN(RTC_TOLERANCE, DELAY_4S, stop - start);
+    TEST_ASSERT_DURATION_WITHIN(1s, 4s, stop - start);
 
     timeout.detach();
 
     if (deepsleep_mode == false) {
         sleep_manager_unlock_deep_sleep();
     }
 
-    rtc_free();
+    RealTimeClock::free();
 }
 #endif
 
 /* Test that ::rtc_init can be called multiple times. */
 void rtc_init_test()
 {
     for (int i = 0; i < 10; i++) {
-        rtc_init();
+        RealTimeClock::init();
     }
 
-    rtc_free();
+    RealTimeClock::free();
 }
 
 #if DEVICE_LPTICKER
@@ -121,103 +123,98 @@ void rtc_sleep_test()
 /* Test that the RTC keeps counting even after ::rtc_free has been called. */
 void rtc_persist_test()
 {
-    const uint32_t start = 100;
-    rtc_init();
-    rtc_write(start);
-    rtc_free();
+    const auto start = RealTimeClock::time_point(100s);
+    RealTimeClock::init();
+    RealTimeClock::write(start);
+    RealTimeClock::free();
 
-    ThisThread::sleep_for(WAIT_TIME * 1000);
+    ThisThread::sleep_for(WAIT_TIME);
 
-    rtc_init();
-    const uint32_t stop = rtc_read();
-    const int enabled = rtc_isenabled();
-    rtc_free();
+    RealTimeClock::init();
+    const auto stop = RealTimeClock::now();
+    const bool enabled = RealTimeClock::isenabled();
+    RealTimeClock::free();
 
     TEST_ASSERT_TRUE(enabled);
-    TEST_ASSERT_UINT32_WITHIN(WAIT_TOLERANCE, WAIT_TIME, stop - start);
+    TEST_ASSERT_DURATION_WITHIN(WAIT_TOLERANCE, WAIT_TIME, stop - start);
 }
 
 /* Test time does not glitch backwards due to an incorrectly implemented ripple counter driver. */
 void rtc_glitch_test()
 {
-    const uint32_t start = 0xffffe;
-    rtc_init();
+    const auto start = RealTimeClock::time_point(0xffffes);
+    RealTimeClock::init();
 
-    rtc_write(start);
-    uint32_t last = start;
-    while (last < start + 4) {
-        const uint32_t cur = rtc_read();
+    RealTimeClock::write(start);
+    auto last = start;
+    while (last < start + 4s) {
+        const auto cur = RealTimeClock::now();
         TEST_ASSERT(cur >= last);
         last = cur;
     }
 
-    rtc_free();
+    RealTimeClock::free();
 }
 
 /* Test that the RTC correctly handles different time values. */
 void rtc_range_test()
 {
-    static const uint32_t starts[] = {
-        0x00000000,
-        0xEFFFFFFF,
-        0x00001000,
-        0x00010000,
+    static const RealTimeClock::time_point starts[] = {
+        RealTimeClock::time_point{0x00000000s},
+        RealTimeClock::time_point{0xEFFFFFFFs},
+        RealTimeClock::time_point{0x00001000s},
+        RealTimeClock::time_point{0x00010000s},
     };
 
-    rtc_init();
-    for (uint32_t i = 0; i < sizeof(starts) / sizeof(starts[0]); i++) {
-        const uint32_t start = starts[i];
-        rtc_write(start);
-        ThisThread::sleep_for(WAIT_TIME * 1000);
-        const uint32_t stop = rtc_read();
-        TEST_ASSERT_UINT32_WITHIN(WAIT_TOLERANCE, WAIT_TIME, stop - start);
+    RealTimeClock::init();
+    for (const auto &start : starts) {
+        RealTimeClock::write(start);
+        ThisThread::sleep_for(WAIT_TIME);
+        const auto stop = RealTimeClock::now();
+        TEST_ASSERT_DURATION_WITHIN(WAIT_TOLERANCE, WAIT_TIME, stop - start);
     }
-    rtc_free();
+    RealTimeClock::free();
 }
 
 /* Test that the RTC accuracy is at least 10%. */
 void rtc_accuracy_test()
 {
     Timer timer1;
 
-    const uint32_t start = 100;
-    rtc_init();
-    rtc_write(start);
+    const auto start = RealTimeClock::time_point(100s);
+    RealTimeClock::init();
+    RealTimeClock::write(start);
 
     timer1.start();
-    while (rtc_read() < (start + DELAY_10S)) {
+    while (RealTimeClock::now() < (start + 10s)) {
         /* Just wait. */
     }
     timer1.stop();
 
     /* RTC accuracy is at least 10%. */
-    TEST_ASSERT_INT32_WITHIN(TOLERANCE_ACCURACY_US, DELAY_10S * US_PER_SEC, timer1.read_us());
+    TEST_ASSERT_DURATION_WITHIN(1s, 10s, timer1.elapsed_time());
 }
 
 /* Test that ::rtc_write/::rtc_read functions provides availability to set/get RTC time. */
 void rtc_write_read_test()
 {
-    static const uint32_t rtc_init_val = 100;
-
-    rtc_init();
-
-    for (int i = 0; i < 3; i++) {
-        const uint32_t init_val = (rtc_init_val + i * rtc_init_val);
+    RealTimeClock::init();
 
+    for (auto init_val = RealTimeClock::time_point(100s); init_val < RealTimeClock::time_point(400s); init_val += 100s) {
         core_util_critical_section_enter();
 
-        rtc_write(init_val);
-        const uint32_t read_val = rtc_read();
+        RealTimeClock::write(init_val);
+        const auto read_val = RealTimeClock::now();
 
         core_util_critical_section_exit();
 
         /* No tolerance is provided since we should have 1 second to
          * execute this case after the RTC time is set.
          */
-        TEST_ASSERT_EQUAL_UINT32(init_val, read_val);
+        TEST_ASSERT(init_val == read_val);
     }
 
-    rtc_free();
+    RealTimeClock::free();
 }
 
 /* Test that ::is_enabled function returns 1 if the RTC is counting and the time has been set. */
@@ -228,10 +225,10 @@ void rtc_enabled_test()
      * and RTC time is set.
      */
 
-    rtc_init();
-    rtc_write(0);
-    TEST_ASSERT_EQUAL_INT(1, rtc_isenabled());
-    rtc_free();
+    RealTimeClock::init();
+    RealTimeClock::write(RealTimeClock::time_point(0s));
+    TEST_ASSERT_TRUE(RealTimeClock::isenabled());
+    RealTimeClock::free();
 }
 
 Case cases[] = {

TESTS/mbed_hal/rtc/main.cpp

@@ -28,22 +28,24 @@
 #else
 
 using utest::v1::Case;
+using std::milli;
+using std::micro;
+using namespace std::chrono;
 
 #if defined(__CORTEX_M23) || defined(__CORTEX_M33)
 #define TEST_STACK_SIZE 512
 #else
 #define TEST_STACK_SIZE 256
 #endif
-#define ONE_MILLI_SEC 1000
 
-volatile uint32_t elapsed_time_ms = 0;
+static duration<uint32_t, milli> elapsed_time_ms;
 static const int test_timeout = 40;
 
 
 void update_tick_thread(Mutex *mutex)
 {
     while (true) {
-        ThisThread::sleep_for(1);
+        ThisThread::sleep_for(1ms);
         mutex->lock();
         ++elapsed_time_ms;
         mutex->unlock();
@@ -69,7 +71,7 @@ void test(void)
     char _value[128] = { };
     int expected_key = 1;
     Mutex mutex;
-    uint32_t elapsed_time;
+    duration<uint32_t, micro> elapsed_time;
 
     Thread tick_thread(osPriorityHigh, TEST_STACK_SIZE);
     tick_thread.start(callback(update_tick_thread, &mutex));
@@ -86,7 +88,7 @@ void test(void)
     elapsed_time = elapsed_time_ms;
     mutex.unlock();
     // send base_time
-    greentea_send_kv(_key, elapsed_time * ONE_MILLI_SEC);
+    greentea_send_kv(_key, elapsed_time.count());
 
     // wait for 2nd signal from host
     greentea_parse_kv(_key, _value, sizeof(_key), sizeof(_value));
@@ -95,7 +97,7 @@ void test(void)
     elapsed_time = elapsed_time_ms;
     mutex.unlock();
     // send final_time
-    greentea_send_kv(_key, elapsed_time * ONE_MILLI_SEC);
+    greentea_send_kv(_key, elapsed_time.count());
 
     //get the results from host
     greentea_parse_kv(_key, _value, sizeof(_key), sizeof(_value));

TESTS/mbedmicro-rtos-mbed/basic/main.cpp

@@ -29,9 +29,10 @@
 #include "rtos.h"
 
 using namespace utest::v1;
+using namespace std::chrono_literals;
 
 #define TEST_STACK_SIZE 512
-#define TEST_DELAY 10
+#define TEST_DELAY 10ms
 
 static int change_counter = 0;
 static Mutex mutex;