Fix storage rtos types - remove including internal header file #7364

0xc0170 · 2018-06-28T13:43:41Z

Description

Remove internal types from our storage rtos header file. And do some refactor (some files still use internal types). Plus some other fixes as I removed one internal rtx from our include, I discovered 2 files not including needed header files!

As result, this also fix some warnings about redefinition STRINGIFY for some platforms (nordic at least).

@JonatanAntoni who I discussed the issue with

Pull request type

[X] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

os_thread_t and family are internal and should not be used (thus we included internal header file). Instead, use those that are exposed via rtx_os.h file.

0xc0170 · 2018-06-28T14:12:59Z

Fixed few errors (I noticed those internal types are used across the code base). This PR should clean it all

pingdan32 · 2018-06-28T14:41:50Z

rtos/TARGET_CORTEX/mbed_rtos_storage.h

@@ -40,17 +40,17 @@ extern "C" {
 implementation specific, header file, therefore limiting scope of possible changes.
 */

-#include "rtx_lib.h"
+#include "rtx_os.h"


Looks good. I like it.

marcuschangarm · 2018-06-28T15:11:55Z

@TacoGrandeTX FYI

0xc0170 · 2018-06-29T08:01:26Z

One more fix incoming, another internal symbol not exposed (jenkins failure). This is a good exercise !

Update: more than one. More internal symbols in our codebase. Fixing it all in once! 🔥 🚒

bulislaw · 2018-06-29T10:00:46Z

rtos/TARGET_CORTEX/mbed_boot.c

@@ -430,6 +430,18 @@ void __rt_entry (void) {
 */
 #if defined(RTX_NO_MULTITHREAD_CLIB)

+// These 2 macros are taken from RTX Config (internal header)


That should probably go into our config file?

I can move it there with default values set. Based on our config, there would be just one
#define OS_THREAD_LIBSPACE_NUM 4, will check

Latest rebase fixed it, moved to conf with default value as it was (4)

RTX Config header file is internal and not exposed. With latest fixes to use only public header files from RTX, we need to add these 2 new macros for RTX ARMC lib configuration.

As we do not include rtx_lib header file anymore, these symbols are not available. Use core util for if ISR is active. And for OS tick, pull in os_tick header file.

os_tick header file is C only, mangling would cause problems here

marcuschangarm · 2018-06-29T15:05:29Z

@0xc0170

Update: more than one. More internal symbols in our codebase. Fixing it all in once! 🔥 🚒

You are on a roll! 😄

deepikabhavnani

👍

cmonr · 2018-07-03T19:57:28Z

/morph build

mbed-ci · 2018-07-03T22:10:50Z

Build : FAILURE

Build number : 2522
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7364/

0xc0170 · 2018-07-04T08:37:36Z

uvisor example failed - @alzix shall I update the example to fix the error or?

Error:

[DEBUG] Output: ./source/led3.cpp:65:5: error: 'os_thread_t' was not declared in this scope
[DEBUG] Output:      os_thread_t thread_def = {0};

0xc0170 · 2018-07-04T08:52:24Z

Fix for uvisor example proposed ARMmbed/mbed-os-example-uvisor-thread#104

Update: PR merged

0xc0170 · 2018-07-04T12:04:38Z

/morph build

mbed-ci · 2018-07-04T12:57:19Z

Build : SUCCESS

Build number : 2528
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7364/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

mbed-ci · 2018-07-04T14:29:28Z

Exporter Build : SUCCESS

Build number : 2176
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7364/

mbed-ci · 2018-07-04T18:06:25Z

Test : SUCCESS

Build number : 2290
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/7364/2290

0xc0170 · 2018-07-04T20:04:05Z

Waiting for final reviews for this bugfix. I labeled is as 5.10 due as apps could use these internal types we exposed. By 5.10, the types should be updated to the one we are providing as storage types for rtos.

cmonr · 2018-07-05T19:29:39Z

+1 on targeting 5.10 due to the changes. LGTM.

0xc0170 added 4 commits June 28, 2018 14:12

rtos: use RTX identifier

5c0f1b5

os_thread_t and family are internal and should not be used (thus we included internal header file). Instead, use those that are exposed via rtx_os.h file.

device key: add memset include

f2cc21d

lwip: fix rtx storage types

1188f4a

Thread: fix rtx thread type

e91ab9c

0xc0170 added the needs: review label Jun 28, 2018

0xc0170 requested review from bulislaw and a team June 28, 2018 13:43

0xc0170 mentioned this pull request Jun 28, 2018

NRF52: rename the STRINGIFY macro to avoid compiler warnings #7329

Closed

0xc0170 added 2 commits June 28, 2018 15:11

kinetis: fix rtos storage type for thread

82b490b

test: fix thread storage size

df821aa

pingdan32 previously approved these changes Jun 28, 2018

View reviewed changes

0xc0170 dismissed pingdan32’s stale review via 20b738e June 29, 2018 07:26

emac targets: fix thread cb type

4d8baa7

0xc0170 force-pushed the fix_storage_rtos branch from 20b738e to 4d8baa7 Compare June 29, 2018 07:35

0xc0170 mentioned this pull request Jun 29, 2018

Redefined macros #7301

Closed

bulislaw reviewed Jun 29, 2018

View reviewed changes

0xc0170 force-pushed the fix_storage_rtos branch from 4d9d292 to fec82aa Compare June 29, 2018 10:41

0xc0170 added 3 commits June 29, 2018 11:43

boot: fix libspace num macro

97a3ca1

RTX Config header file is internal and not exposed. With latest fixes to use only public header files from RTX, we need to add these 2 new macros for RTX ARMC lib configuration.

tests: fix internal symbols from RTX

fcadf0b

As we do not include rtx_lib header file anymore, these symbols are not available. Use core util for if ISR is active. And for OS tick, pull in os_tick header file.

test: fix os tick linkage

dd33247

os_tick header file is C only, mangling would cause problems here

0xc0170 force-pushed the fix_storage_rtos branch from fec82aa to dd33247 Compare June 29, 2018 10:43

deepikabhavnani approved these changes Jul 3, 2018

View reviewed changes

cmonr added needs: CI and removed needs: review labels Jul 3, 2018

0xc0170 added the release-version: 5.10.0-rc1 label Jul 4, 2018

0xc0170 mentioned this pull request Jul 4, 2018

led3: thread type fix ARMmbed/mbed-os-example-uvisor-thread#104

Merged

0xc0170 added needs: review and removed needs: CI labels Jul 4, 2018

0xc0170 requested a review from a team July 4, 2018 20:02

cmonr approved these changes Jul 5, 2018

View reviewed changes

cmonr merged commit 93233c4 into ARMmbed:master Jul 5, 2018

0xc0170 removed the needs: review label Jul 5, 2018

Fix storage rtos types - remove including internal header file #7364

Fix storage rtos types - remove including internal header file #7364

Uh oh!

Conversation

0xc0170 commented Jun 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Pull request type

Uh oh!

0xc0170 commented Jun 28, 2018

Uh oh!

pingdan32 Jun 28, 2018

Choose a reason for hiding this comment

Uh oh!

marcuschangarm commented Jun 28, 2018

Uh oh!

0xc0170 commented Jun 29, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bulislaw Jun 29, 2018

Choose a reason for hiding this comment

Uh oh!

0xc0170 Jun 29, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xc0170 Jun 29, 2018

Choose a reason for hiding this comment

Uh oh!

marcuschangarm commented Jun 29, 2018

Uh oh!

deepikabhavnani left a comment

Choose a reason for hiding this comment

Uh oh!

cmonr commented Jul 3, 2018

Uh oh!

mbed-ci commented Jul 3, 2018

Build : FAILURE

Uh oh!

0xc0170 commented Jul 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xc0170 commented Jul 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xc0170 commented Jul 4, 2018

Uh oh!

mbed-ci commented Jul 4, 2018

Build : SUCCESS

Triggering tests

Uh oh!

mbed-ci commented Jul 4, 2018

Exporter Build : SUCCESS

Uh oh!

mbed-ci commented Jul 4, 2018

Test : SUCCESS

Uh oh!

0xc0170 commented Jul 4, 2018

Uh oh!

cmonr commented Jul 5, 2018

Uh oh!

Uh oh!

0xc0170 commented Jun 28, 2018 •

edited

Loading

0xc0170 commented Jun 29, 2018 •

edited

Loading

0xc0170 Jun 29, 2018 •

edited

Loading

0xc0170 commented Jul 4, 2018 •

edited

Loading

0xc0170 commented Jul 4, 2018 •

edited

Loading