Cleanup

1. Enable watermark to get stack space information
2. Restructured code
3. Throw error if MBED_THREAD_STATS_ENABLED is not set
4. Astyle changes

Author: deepikabhavnani

TESTS/mbed_platform/stats_thread/main.cpp

@@ -22,7 +22,7 @@
 #include "mbed.h"
 
 #if !defined(MBED_THREAD_STATS_ENABLED)
-#warning [NOT_SUPPORTED] test not supported
+#error [NOT_SUPPORTED] test not supported
 #endif
 
 using namespace utest::v1;
@@ -54,16 +54,15 @@ void test_case_single_thread_stats()
 {
     mbed_stats_thread_t *stats = new mbed_stats_thread_t[MAX_THREAD_STATS];
     int old_count = mbed_stats_thread_get_each(stats, MAX_THREAD_STATS);
-
     Thread t1(osPriorityNormal, TEST_STACK_SIZE, NULL, "Th1");
     t1.start(increment_with_delay);
 
     // Read stats
     int count = mbed_stats_thread_get_each(stats, MAX_THREAD_STATS);
-    TEST_ASSERT_EQUAL(1, (count-old_count));
+    TEST_ASSERT_EQUAL(1, (count - old_count));
 
-    for(int i = 0; i < count; i++) {
-        if(0 == strcmp(stats[i].name, "Th1")) {
+    for (int i = 0; i < count; i++) {
+        if (0 == strcmp(stats[i].name, "Th1")) {
             TEST_ASSERT_EQUAL(TEST_STACK_SIZE, stats[i].stack_size);
             TEST_ASSERT_EQUAL(osPriorityNormal, stats[i].priority);
             break;
@@ -96,13 +95,13 @@ void test_case_multi_threads_blocked()
     // Read stats
 
     int count = mbed_stats_thread_get_each(stats, MAX_THREAD_STATS);
-    TEST_ASSERT_EQUAL(2, (count-old_count));
-    for(int i = 0; i < count; i++) {
-        if(0 == strcmp(stats[i].name, "Th2")) {
+    TEST_ASSERT_EQUAL(2, (count - old_count));
+    for (int i = 0; i < count; i++) {
+        if (0 == strcmp(stats[i].name, "Th2")) {
             TEST_ASSERT_EQUAL(TEST_STACK_SIZE, stats[i].stack_size);
             TEST_ASSERT_EQUAL(osPriorityNormal1, stats[i].priority);
             TEST_ASSERT_EQUAL(osThreadBlocked, stats[i].state);
-        } else if(0 == strcmp (stats[i].name, "Th1")) {
+        } else if (0 == strcmp (stats[i].name, "Th1")) {
             TEST_ASSERT_EQUAL(TEST_STACK_SIZE, stats[i].stack_size);
             TEST_ASSERT_EQUAL(osPriorityNormal, stats[i].priority);
         }
@@ -115,7 +114,7 @@ void test_case_multi_threads_blocked()
     Thread::wait(100);
 
     count = mbed_stats_thread_get_each(stats, MAX_THREAD_STATS);
-    TEST_ASSERT_EQUAL(1, (count-old_count));
+    TEST_ASSERT_EQUAL(1, (count - old_count));
 
     t1.terminate();
     delete[] stats;
@@ -134,13 +133,13 @@ void test_case_multi_threads_terminate()
     // Read stats
 
     int count = mbed_stats_thread_get_each(stats, MAX_THREAD_STATS);
-    TEST_ASSERT_EQUAL(2, (count-old_count));
+    TEST_ASSERT_EQUAL(2, (count - old_count));
 
-    for(int i = 0; i < count; i++) {
-        if(0 == strcmp(stats[i].name, "Th2")) {
+    for (int i = 0; i < count; i++) {
+        if (0 == strcmp(stats[i].name, "Th2")) {
             TEST_ASSERT_EQUAL(TEST_STACK_SIZE, stats[i].stack_size);
             TEST_ASSERT_EQUAL(osPriorityNormal2, stats[i].priority);
-        } else if(0 == strcmp(stats[i].name, "Th1")) {
+        } else if (0 == strcmp(stats[i].name, "Th1")) {
             TEST_ASSERT_EQUAL(TEST_STACK_SIZE, stats[i].stack_size);
             TEST_ASSERT_EQUAL(osPriorityNormal1, stats[i].priority);
             TEST_ASSERT_EQUAL(osThreadBlocked, stats[i].state);

platform/mbed_stats.c

@@ -5,6 +5,8 @@
 
 #ifdef MBED_CONF_RTOS_PRESENT
 #include "cmsis_os2.h"
+#elif defined(MBED_STACK_STATS_ENABLED) || defined(MBED_THREAD_STATS_ENABLED)
+#warning Statistics are currently not supported without the rtos.
 #endif
 
 // note: mbed_stats_heap_get defined in mbed_alloc_wrappers.cpp
@@ -24,7 +26,7 @@ void mbed_stats_stack_get(mbed_stats_stack_t *stats)
     osKernelLock();
     thread_n = osThreadEnumerate(threads, thread_n);
 
-    for(i = 0; i < thread_n; i++) {
+    for (i = 0; i < thread_n; i++) {
         uint32_t stack_size = osThreadGetStackSize(threads[i]);
         stats->max_size += stack_size - osThreadGetStackSpace(threads[i]);
         stats->reserved_size += stack_size;
@@ -38,7 +40,7 @@ void mbed_stats_stack_get(mbed_stats_stack_t *stats)
 
 size_t mbed_stats_stack_get_each(mbed_stats_stack_t *stats, size_t count)
 {
-    memset(stats, 0, count*sizeof(mbed_stats_stack_t));
+    memset(stats, 0, count * sizeof(mbed_stats_stack_t));
     size_t i = 0;
 
 #if defined(MBED_STACK_STATS_ENABLED) && defined(MBED_CONF_RTOS_PRESENT)
@@ -50,7 +52,7 @@ size_t mbed_stats_stack_get_each(mbed_stats_stack_t *stats, size_t count)
     osKernelLock();
     count = osThreadEnumerate(threads, count);
 
-    for(i = 0; i < count; i++) {
+    for (i = 0; i < count; i++) {
         uint32_t stack_size = osThreadGetStackSize(threads[i]);
         stats[i].max_size = stack_size - osThreadGetStackSpace(threads[i]);
         stats[i].reserved_size = stack_size;
@@ -80,7 +82,7 @@ size_t mbed_stats_thread_get_each(mbed_stats_thread_t *stats, size_t count)
     osKernelLock();
     count = osThreadEnumerate(threads, count);
 
-    for(i = 0; i < count; i++) {
+    for (i = 0; i < count; i++) {
         stats[i].id = (uint32_t)threads[i];
         stats[i].state = (uint32_t)osThreadGetState(threads[i]);
         stats[i].priority = (uint32_t)osThreadGetPriority(threads[i]);
@@ -94,7 +96,3 @@ size_t mbed_stats_thread_get_each(mbed_stats_thread_t *stats, size_t count)
 
     return i;
 }
-
-#if (defined(MBED_STACK_STATS_ENABLED) || defined(MBED_THREAD_STATS_ENABLED)) && !defined(MBED_CONF_RTOS_PRESENT)
-#warning statistics are currently not supported without the rtos.
-#endif

platform/mbed_stats.h

@@ -47,19 +47,6 @@ typedef struct {
     uint32_t alloc_fail_cnt;    /**< Number of failed allocations. */
 } mbed_stats_heap_t;
 
-/**
- * struct mbed_stats_thread_t definition
- */
-
-typedef struct {
-    uint32_t id;                /**< Thread Object Identifier */
-    uint32_t state;             /**< Thread Object State */
-    uint32_t priority;          /**< Thread Priority */
-    uint32_t stack_size;        /**< Thread Stack Size */
-    uint32_t stack_space;       /**< Thread remaining stack size */
-    const char   *name;         /**< Thread Object name */
-} mbed_stats_thread_t;
-
 /**
  *  Fill the passed in heap stat structure with heap stats.
  *
@@ -95,6 +82,19 @@ void mbed_stats_stack_get(mbed_stats_stack_t *stats);
  */
 size_t mbed_stats_stack_get_each(mbed_stats_stack_t *stats, size_t count);
 
+/**
+ * struct mbed_stats_thread_t definition
+ */
+
+typedef struct {
+    uint32_t id;                /**< Thread Object Identifier */
+    uint32_t state;             /**< Thread Object State */
+    uint32_t priority;          /**< Thread Priority */
+    uint32_t stack_size;        /**< Thread Stack Size */
+    uint32_t stack_space;       /**< Thread remaining stack size */
+    const char   *name;         /**< Thread Object name */
+} mbed_stats_thread_t;
+
 /**
  *  Fill the passed array of stat structures with the thread stats for each available thread.
  *

rtos/TARGET_CORTEX/mbed_rtx_conf.h

@@ -49,6 +49,10 @@
 #define OS_STACK_WATERMARK          1
 #endif
 
+#if !defined(OS_STACK_WATERMARK) && defined(MBED_THREAD_STATS_ENABLED)
+#define OS_STACK_WATERMARK          1
+#endif
+
 /* Run threads unprivileged when uVisor is enabled. */
 #if defined(FEATURE_UVISOR) && defined(TARGET_UVISOR_SUPPORTED)
 # define OS_PRIVILEGE_MODE           0