Merge https://github.com/ARMmbed/mbed-os into security-manager-dev

Author: paul-szczepanek-arm

.travis.yml

@@ -123,13 +123,13 @@ matrix:
           PREV=$(curl https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
               | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
                   | .statuses[] | select(.context == \"travis-ci/$NAME\").description
-                  | capture(\", (?<warnings>[0-9]+) warnings\").warnings" \
+                  | capture(\", (?<files>[0-9]+) files\").warnings" \
               || echo 0)
 
-          STATUSM="Passed, ${CURR} warnings"
+          STATUSM="Passed, ${CURR} files"
           if [ "$PREV" -ne 0 ]
           then
-              STATUSM="$STATUSM ($(python -c "print '%+d' % ($CURR-$PREV)") warnings)"
+              STATUSM="$STATUSM ($(python -c "print '%+d' % ($CURR-$PREV)") files)"
           fi
         - bash -c "$STATUS" success "$STATUSM"
 
@@ -150,7 +150,7 @@ matrix:
         - python tools/make.py -t GCC_ARM -m K64F --source=. --build=BUILD/K64F/GCC_ARM -j0
         # Check that example compiles without rtos
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
-        - rm -r rtos features/cellular features/netsocket features/nanostack features/frameworks BUILD
+        - rm -r rtos features/cellular features/netsocket features/nanostack features/frameworks/greentea-client features/frameworks/utest features/frameworks/unity BUILD
         - python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
         # Run local equeue tests
         - make -C $EVENTS/equeue test

TESTS/events/queue/main.cpp

@@ -250,6 +250,46 @@ void event_inference_test() {
     TEST_ASSERT_EQUAL(counter, 60);
 }
 
+int timeleft_events[2];
+
+void check_time_left(EventQueue* queue, int index, int expected) {
+    const int event_id = timeleft_events[index];
+    TEST_ASSERT_INT_WITHIN(2, expected, queue->time_left(event_id));
+    touched = true;
+}
+
+void time_left(EventQueue* queue, int index) {
+    const int event_id = timeleft_events[index];
+    TEST_ASSERT_EQUAL(0, queue->time_left(event_id));
+}
+
+void time_left_test() {
+    EventQueue queue(TEST_EQUEUE_SIZE);
+
+    // Enque check events
+    TEST_ASSERT(queue.call_in(50, check_time_left, &queue, 0, 100-50));
+    TEST_ASSERT(queue.call_in(200, check_time_left, &queue, 1, 200-200));
+
+    // Enque events to be checked
+    timeleft_events[0] = queue.call_in(100, time_left, &queue, 0);
+    timeleft_events[1] = queue.call_in(200, time_left, &queue, 1);
+    TEST_ASSERT(timeleft_events[0]);
+    TEST_ASSERT(timeleft_events[1]);
+
+    queue.dispatch(300);
+
+    // Ensure check was called
+    TEST_ASSERT(touched);
+    touched = false;
+
+    int id = queue.call(func0);
+    TEST_ASSERT(id);
+    TEST_ASSERT_EQUAL(0, queue.time_left(id));
+    queue.dispatch(10);
+
+    // Test invalid event id
+    TEST_ASSERT_EQUAL(-1, queue.time_left(0));
+}
 
 // Test setup
 utest::v1::status_t test_setup(const size_t number_of_cases) {
@@ -274,6 +314,8 @@ const Case cases[] = {
     Case("Testing the event class", event_class_test),
     Case("Testing the event class helpers", event_class_helper_test),
     Case("Testing the event inference", event_inference_test),
+
+    Case("Testing time_left", time_left_test),
 };
 
 Specification specification(test_setup, cases);

TESTS/mbed_platform/stats_cpu/main.cpp

@@ -0,0 +1,112 @@
+
+/* mbed Microcontroller Library
+ * Copyright (c) 2018 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "greentea-client/test_env.h"
+#include "unity/unity.h"
+#include "utest/utest.h"
+
+#include "mbed.h"
+
+#if !defined(MBED_CPU_STATS_ENABLED) || !defined(DEVICE_LOWPOWERTIMER) || !defined(DEVICE_SLEEP)
+#error [NOT_SUPPORTED] test not supported
+#endif
+
+using namespace utest::v1;
+
+DigitalOut led1(LED1);
+
+#define MAX_THREAD_STACK        384
+#define SAMPLE_TIME             1000    // msec
+#define LOOP_TIME               2000    // msec
+
+static int32_t wait_time = 5000;
+
+static void busy_thread()
+{
+    volatile uint64_t i = ~0;
+    
+    while (i--) {
+        led1 = !led1;
+        wait_us(wait_time);
+    }
+}
+
+void get_cpu_usage()
+{
+    static uint64_t prev_idle_time = 0;
+    mbed_stats_cpu_t stats;
+
+    while (1) {
+        mbed_stats_cpu_get(&stats);
+        uint64_t diff = (stats.idle_time - prev_idle_time);
+        uint8_t usage = 100 - ((diff * 100) / (SAMPLE_TIME * 1000));
+        prev_idle_time = stats.idle_time;
+        TEST_ASSERT_NOT_EQUAL(0, usage);
+        Thread::wait(SAMPLE_TIME);
+    }
+}
+
+void test_cpu_info(void)
+{
+    mbed_stats_cpu_t stats;
+    // Additional read to make sure timer is initialized
+    mbed_stats_cpu_get(&stats);
+    Thread::wait(1);
+    mbed_stats_cpu_get(&stats);
+    TEST_ASSERT_NOT_EQUAL(0, stats.uptime);
+    TEST_ASSERT_NOT_EQUAL(0, stats.idle_time);
+    return;
+}
+
+void test_cpu_load(void)
+{
+
+    Thread thread(osPriorityNormal, MAX_THREAD_STACK);
+    Thread thread_stats(osPriorityNormal, MAX_THREAD_STACK);
+
+    thread.start(busy_thread);
+    thread_stats.start(get_cpu_usage);
+
+    // Steadily increase the system load
+    for (int count = 1; ; count++) {
+        Thread::wait(LOOP_TIME);
+        if (wait_time <= 0) {
+            break;
+        }
+        wait_time -= 1000;  // usec
+    }
+    thread.terminate();
+    thread_stats.terminate();
+}
+
+Case cases[] = {
+    Case("Test CPU Info", test_cpu_info),
+    Case("Test CPU load", test_cpu_load)
+};
+
+utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
+{
+    GREENTEA_SETUP(20, "default_auto");
+    return greentea_test_setup_handler(number_of_cases);
+}
+
+Specification specification(greentea_test_setup, cases, greentea_test_teardown_handler);
+
+int main()
+{
+    Harness::run(specification);
+}

TESTS/mbed_platform/stats_sys/main.cpp

@@ -0,0 +1,68 @@
+
+/* mbed Microcontroller Library
+ * Copyright (c) 2018 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "greentea-client/test_env.h"
+#include "unity/unity.h"
+#include "utest/utest.h"
+
+#include "mbed.h"
+
+#if !defined(MBED_SYS_STATS_ENABLED)
+#error [NOT_SUPPORTED] test not supported
+#endif
+
+using namespace utest::v1;
+
+void test_sys_info()
+{
+    mbed_stats_sys_t stats;
+    mbed_stats_sys_get(&stats);
+
+#if defined(MBED_VERSION)
+    TEST_ASSERT_NOT_EQUAL(0, stats.os_version);
+#endif
+
+#if defined(__CORTEX_M)
+    TEST_ASSERT_NOT_EQUAL(0, stats.cpu_id);
+#endif
+
+#if defined(__IAR_SYSTEMS_ICC__)
+    TEST_ASSERT_EQUAL(IAR, stats.compiler_id);
+#elif defined(__CC_ARM)
+    TEST_ASSERT_EQUAL(ARM, stats.compiler_id);
+#elif defined(__GNUC__)
+    TEST_ASSERT_EQUAL(GCC_ARM, stats.compiler_id);
+#endif
+    TEST_ASSERT_NOT_EQUAL(0, stats.compiler_version);
+}
+
+Case cases[] = {
+    Case("Test Sys Info", test_sys_info)
+};
+
+utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
+{
+    GREENTEA_SETUP(20, "default_auto");
+    return greentea_test_setup_handler(number_of_cases);
+}
+
+Specification specification(greentea_test_setup, cases, greentea_test_teardown_handler);
+
+int main()
+{
+    Harness::run(specification);
+}

TESTS/mbedtls/multi/main.cpp

@@ -23,6 +23,12 @@
 
 #include "mbedtls/sha256.h"
 
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf     printf
+#endif
 
 using namespace utest::v1;
 
@@ -163,5 +169,18 @@ utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {
 Specification specification(greentea_test_setup, cases, greentea_test_teardown_handler);
 
 int main() {
-    Harness::run(specification);
+    int ret = 0;
+#if defined(MBEDTLS_PLATFORM_C)
+    mbedtls_platform_context platform_ctx;
+    if((ret = mbedtls_platform_setup(&platform_ctx))!= 0)
+    {
+        mbedtls_printf("Mbed TLS multitest failed! mbedtls_platform_setup returned %d\n", ret);
+        return 1;
+    }
+#endif
+    ret = (Harness::run(specification) ? 0 : 1);
+#if defined(MBEDTLS_PLATFORM_C)
+    mbedtls_platform_teardown(&platform_ctx);
+#endif
+    return ret;
 }

TESTS/mbedtls/selftest/main.cpp

@@ -39,12 +39,7 @@ using namespace utest::v1;
 #include "mbedtls/platform.h"
 #else
 #include <stdio.h>
-#include <stdlib.h>
 #define mbedtls_printf     printf
-#define mbedtls_snprintf   snprintf
-#define mbedtls_exit       exit
-#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
-#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
 #endif
 
 #define MBEDTLS_SELF_TEST_TEST_CASE(self_test_function) \
@@ -97,6 +92,19 @@ utest::v1::status_t test_setup(const size_t num_cases) {
 Specification specification(test_setup, cases);
 
 int main() {
-    return !Harness::run(specification);
+    int ret = 0;
+#if defined(MBEDTLS_PLATFORM_C)
+    mbedtls_platform_context platform_ctx;
+    if((ret = mbedtls_platform_setup(&platform_ctx))!= 0)
+    {
+        mbedtls_printf("Mbed TLS selftest failed! mbedtls_platform_setup returned %d\n", ret);
+        return 1;
+    }
+#endif
+    ret = (Harness::run(specification) ? 0 : 1);
+#if defined(MBEDTLS_PLATFORM_C)
+    mbedtls_platform_teardown(&platform_ctx);
+#endif
+    return ret;
 }
 

drivers/UARTSerial.h

@@ -142,6 +142,15 @@ class UARTSerial : private SerialBase, public FileHandle, private NonCopyable<UA
         return 0;
     }
 
+    /** Check current blocking or non-blocking mode for file operations.
+     *
+     *  @return             true for blocking mode, false for non-blocking mode.
+     */
+    virtual bool is_blocking() const
+    {
+        return _blocking;
+    }
+
     /** Register a callback on state change of the file.
      *
      *  The specified callback will be called on state changes such as when

events/EventQueue.cpp

@@ -47,6 +47,10 @@ void EventQueue::cancel(int id) {
     return equeue_cancel(&_equeue, id);
 }
 
+int EventQueue::time_left(int id) {
+    return equeue_timeleft(&_equeue, id);
+}
+
 void EventQueue::background(Callback<void(int)> update) {
     _update = update;