Renamed files in platform to match source names #3654

geky · 2017-01-27T11:56:03Z

Small pr to rename the files in platform to match source names.

Here's the changed files

critical.h     -> mbed_critical.h
sleep.h        -> mbed_sleep.h
toolchain.h    -> mbed_toolchain.h
rtc_time.h     -> mbed_rtc_time.h
semihost_api.h -> mbed_semihost_api.h
wait_api.h     -> mbed_wait_api.h

Useful sed command for updating files:

sed -i 's/#include "\(.*\)\<\(critical\|sleep\|toolchain\|rtc_time\|semihost_api\|wait_api\).h"/#include "\1mbed_\2.h"/' $(find -regex '.*\.\(h\|hpp\|c\|cpp\)')

Should resolve #3259
cc @bridadan, @adbridge, @0xc0170

bridadan · 2017-01-27T12:12:51Z

@geky Can you take a look at the travis failure?

$ python tools/build_travis.py
Executing: python tools/build.py -m LPC1768 -t GCC_ARM -j 4 -c --silent --dsp --rtos --eth --usb_host --usb --ublox --fat
/home/travis/build/ARMmbed/mbed-os/drivers/LocalFileSystem.cpp:20:45: fatal error: platform/mbed_mbed_semihost_api.h: No such file or directory
 #include "platform/mbed_mbed_semihost_api.h"

adbridge · 2017-01-30T15:15:26Z

Looks like the sed added an extra 'mbed_' for some of the files , resulting in eg. mbed_mbed_semihost_api.h which is obviously wrong. Looks like this change may need revisiting.
Files that need fixing:
drivers/LocalFileSystem.cpp
features/unsupported/tests/mbed/file/main.cpp
features/unsupported/tests/mbed/semihost/main.cpp
features/unsupported/tests/utest/general/general.cpp
features/unsupported/tests/utest/semihost_fs/semihost_fs.cpp
platform/mbed_interface.c
platform/mbed_retarget.cpp
platform/mbed_semihost_api.c
platform/rtc_time.h
platform/semihost_api.h
platform/sleep.h
platform/toolchain.h
platform/wait_api.h

geky · 2017-01-30T15:22:57Z

Noted: Don't run the script twice 😆

Should be updated

adbridge · 2017-01-30T15:24:35Z

/morph test

adbridge

Looks good after the update

mbed-bot · 2017-01-30T15:51:10Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1472

Build failed!

mazimkhan · 2017-01-30T17:31:55Z

retest uvisor

mazimkhan · 2017-01-30T17:33:47Z

retest uvisor

0xc0170 · 2017-01-31T09:30:21Z

platform/critical.h

-#endif // __MBED_UTIL_CRITICAL_H__
-
-/** @}*/
+#warning critical.h has been replaced by mbed_critical.h, please update to mbed_critical.h [since mbed-os-5.3]


Shouldn't all these headers have still protection against multiple inclusion? (as it had on line 21, 22 in this one)

The included file has the protection against multiple inclusion, the only downside is multiple warning messages which shouldn't be an issue.

the only downside is multiple warning messages which shouldn't be an issue.

That's what I was referring to.

Shouldn't all these headers have still protection against multiple inclusion?

can this be added back?

@geky bump - can header guards get added back in?

Ah sorry, I missed this earlier. Didn't realize this was a blocking issue?

Should be updated

0xc0170 · 2017-01-31T09:46:14Z

There's failure with morph CI for this command: mbed test --compile -m NCS36510 -t ARM -DMBED_HEAP_STATS_ENABLED=1 -DMBED_STACK_STATS_ENABLED=1 --clean

Locally, latest master works, its regarding sleep that should not be affected by this PR.

/morph test

mbed-bot · 2017-01-31T11:16:15Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1479

Build failed!

0xc0170 · 2017-01-31T11:53:02Z

OK, the failure is even on master but it did not break , anyway, going to fix it on master, this can be rebased on top of it.

0xc0170 · 2017-01-31T12:47:01Z

PR referenced above that should fix the morph failure, please review, rebase once integrated

sg- · 2017-02-02T17:52:48Z

@geky PR maintenance needed.

geky · 2017-02-02T18:05:15Z

Should be up to date. Rebasing this guy is quite painful when the header files are modified.

bridadan · 2017-02-02T20:24:40Z

/morph test

mbed-bot · 2017-02-03T00:39:29Z

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1498

All builds and test passed!

adbridge · 2017-02-06T15:35:15Z

@mazimkhan

mazimkhan · 2017-02-06T15:38:01Z

retest uvisor

geky · 2017-02-15T22:28:55Z

/morph test

mbed-bot · 2017-02-16T06:32:25Z

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1610

All builds and test passed!

bridadan · 2017-02-16T21:59:05Z

Hey @geky I looked through the CI logs and it looks like there's only one include that needs to be touched up: https://github.com/ARMmbed/mbed-os/blob/master/rtos/rtos_idle.c#L24

This came in as part of #3566 after you made this PR, so this just needs a rebase/update!

0xc0170 · 2017-02-20T16:53:32Z

@geky Can you please resolve the conflict and run CI again?

critical.h -> mbed_critical.h sleep.h -> mbed_sleep.h toolchain.h -> mbed_toolchain.h rtc_time.h -> mbed_rtc_time.h semihost_api.h -> mbed_semihost_api.h wait_api.h -> mbed_wait_api.h

geky · 2017-02-23T00:18:56Z

Updated again
/morph test-nightly

bridadan · 2017-02-23T00:25:39Z

Ooops, bot was down....

/morph test-nightly

mbed-bot · 2017-02-23T03:35:02Z

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 1682

All builds and test passed!

geky added needs: CI needs: review labels Jan 27, 2017

geky requested review from bridadan and adbridge January 27, 2017 11:56

bridadan approved these changes Jan 27, 2017

View reviewed changes

geky force-pushed the header-rename branch from ce07a58 to febb5ff Compare January 30, 2017 15:22

adbridge approved these changes Jan 30, 2017

View reviewed changes

adbridge removed the needs: review label Jan 30, 2017

0xc0170 reviewed Jan 31, 2017

View reviewed changes

0xc0170 mentioned this pull request Jan 31, 2017

Fix ncs36510 sleep definitions #3664

Merged

geky force-pushed the header-rename branch 3 times, most recently from 04a699b to d2a66cf Compare February 2, 2017 18:49

sg- added ready for merge needs: work and removed needs: CI ready for merge labels Feb 7, 2017

geky force-pushed the header-rename branch from d2a66cf to 6563185 Compare February 15, 2017 22:28

sg- approved these changes Feb 22, 2017

View reviewed changes

sg- added the release-version: 5.4.0 label Feb 22, 2017

Renamed files in platform to match source names

aff49d8

critical.h -> mbed_critical.h sleep.h -> mbed_sleep.h toolchain.h -> mbed_toolchain.h rtc_time.h -> mbed_rtc_time.h semihost_api.h -> mbed_semihost_api.h wait_api.h -> mbed_wait_api.h

geky force-pushed the header-rename branch from 6563185 to aff49d8 Compare February 23, 2017 00:18

0xc0170 approved these changes Feb 23, 2017

View reviewed changes

0xc0170 added ready for merge and removed needs: work labels Feb 23, 2017

sg- removed the ready for merge label Feb 23, 2017

sg- merged commit 30ddefc into ARMmbed:master Feb 23, 2017

geky mentioned this pull request Mar 1, 2017

Updated includes of renamed platform header files #3868

Merged

Renamed files in platform to match source names #3654

Renamed files in platform to match source names #3654

Uh oh!

Conversation

geky commented Jan 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bridadan commented Jan 27, 2017

Uh oh!

adbridge commented Jan 30, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

geky commented Jan 30, 2017

Uh oh!

adbridge commented Jan 30, 2017

Uh oh!

adbridge left a comment

Choose a reason for hiding this comment

Uh oh!

mbed-bot commented Jan 30, 2017

Output

Uh oh!

mazimkhan commented Jan 30, 2017

Uh oh!

mazimkhan commented Jan 30, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xc0170 commented Jan 31, 2017

Uh oh!

mbed-bot commented Jan 31, 2017

Output

Uh oh!

0xc0170 commented Jan 31, 2017

Uh oh!

0xc0170 commented Jan 31, 2017

Uh oh!

sg- commented Feb 2, 2017

Uh oh!

geky commented Feb 2, 2017

Uh oh!

bridadan commented Feb 2, 2017

Uh oh!

mbed-bot commented Feb 3, 2017

Output

Uh oh!

adbridge commented Feb 6, 2017

Uh oh!

mazimkhan commented Feb 6, 2017

Uh oh!

geky commented Feb 15, 2017

Uh oh!

mbed-bot commented Feb 16, 2017

Output

Uh oh!

bridadan commented Feb 16, 2017

Uh oh!

0xc0170 commented Feb 20, 2017

Uh oh!

geky commented Feb 23, 2017

Uh oh!

bridadan commented Feb 23, 2017

Uh oh!

mbed-bot commented Feb 23, 2017

Output

Uh oh!

Uh oh!

geky commented Jan 27, 2017 •

edited

Loading

adbridge commented Jan 30, 2017 •

edited

Loading