Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sleep tracing not finding matching driver during unlock. #9685

Merged
merged 1 commit into from Feb 14, 2019

Conversation

Projects
None yet
8 participants
@scartmell-arm
Copy link
Contributor

scartmell-arm commented Feb 12, 2019

Sleep tracing lookup was broken when the code was refactored during one of the commits. Revert the breaking commit.

Reverted commit: 9a0e879.

Fixes: #8205

Pull request type

    [X] Fix
    [ ] Refactor
    [ ] Target update
    [ ] Functionality change
    [ ] Docs update
    [ ] Test update
    [ ] Breaking change

Reviewers

@TacoGrandeTX

@0xc0170

This comment has been minimized.

Copy link
Member

0xc0170 commented Feb 12, 2019

What did actually break it ?

@ciarmcom ciarmcom requested review from TacoGrandeTX and ARMmbed/mbed-os-maintainers Feb 12, 2019

@ciarmcom

This comment has been minimized.

Copy link
Member

ciarmcom commented Feb 12, 2019

@ciarmcom

This comment has been minimized.

Copy link
Member

ciarmcom commented Feb 12, 2019

@deepikabhavnani
Copy link
Contributor

deepikabhavnani left a comment

Change looks good, it will be good to add a test case (failing one)
@TacoGrandeTX - Please share the use case where it was failing, and also please verify the fix

@TacoGrandeTX

This comment has been minimized.

Copy link
Contributor

TacoGrandeTX commented Feb 12, 2019

I tested this with the same test program here: #8205

On the K64F it hard faulted and on the nRF52_DK the output was wrong.

It appears we missed this part of the revert:
https://github.com/ARMmbed/mbed-os/blob/0f6b73ae0f30d4aab8617fe62a6cc469bc5a352b/hal/mbed_sleep_manager.c#L37:L40
When I bring that in, I see proper output for the test:

LOCK: Timer.cpp, ln: 55, lock count: 1
Sleep locks held:
[id: Timer.cpp, count: 1]
...
Sleep locks held:
[id: Timer.cpp, count: 1]
UNLOCK: Timer.cpp, ln: 69, lock count: 0
Sleep locks held:
Sleep locks held:

@cmonr

cmonr approved these changes Feb 13, 2019

@cmonr

This comment has been minimized.

Copy link
Contributor

cmonr commented Feb 13, 2019

@scartmell-arm 👍 to your past self for the older commit mesasge.

Helps to make a quick before/after comparison.

@cmonr

This comment has been minimized.

Copy link
Contributor

cmonr commented Feb 13, 2019

CI started

@cmonr cmonr added needs: CI and removed needs: review labels Feb 13, 2019

@deepikabhavnani

This comment has been minimized.

Copy link
Contributor

deepikabhavnani commented Feb 13, 2019

@cmonr - This needs work
On the K64F it hard faulted and on the nRF52_DK the output was wrong.
It appears we missed this part of the revert:

@deepikabhavnani
Copy link
Contributor

deepikabhavnani left a comment

Identifier should be char identifier[IDENTIFIER_WIDTH]; instead of const char *
Not sure why, I don't see a push commit in between and still code is fixed

Not fixed - Should allocate memory for string storage
https://github.com/ARMmbed/mbed-os/pull/9685/files#diff-e755578b30cfd39589b0f0a179cc520bR83

@mbed-ci

This comment has been minimized.

Copy link

mbed-ci commented Feb 13, 2019

Test run: SUCCESS

Summary: 12 of 12 test jobs passed
Build number : 1
Build artifacts

@scartmell-arm scartmell-arm force-pushed the scartmell-arm:fix-sleep-tracer-lookup-failing branch to 3f12c19 Feb 13, 2019

@scartmell-arm

This comment has been minimized.

Copy link
Contributor Author

scartmell-arm commented Feb 13, 2019

Sorry, not sure how I missed that part. Fixed.

@cmonr

This comment has been minimized.

Copy link
Contributor

cmonr commented Feb 13, 2019

CI started

@mbed-ci

This comment has been minimized.

Copy link

mbed-ci commented Feb 14, 2019

Test run: SUCCESS

Summary: 12 of 12 test jobs passed
Build number : 2
Build artifacts

@cmonr cmonr removed the needs: CI label Feb 14, 2019

@0xc0170 0xc0170 merged commit 1492dc1 into ARMmbed:master Feb 14, 2019

27 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jenkins-ci/build-ARM Success
Details
jenkins-ci/build-ARMC6 Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/dynamic-memory-usage RTOS ROM(+0 bytes) RAM(+0 bytes)
Details
jenkins-ci/exporter Success
Details
jenkins-ci/greentea-test Success
Details
jenkins-ci/mbed2-build-ARM Success
Details
jenkins-ci/mbed2-build-GCC_ARM Success
Details
jenkins-ci/mbed2-build-IAR Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Local astyle testing has passed
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/doxy-spellcheck Local doxy-spellcheck testing has passed
Details
travis-ci/events Passed, runtime is 9941 cycles (+596 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/include_check Local include_check testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8408B (+0.00%)
Details
travis-ci/psa-autogen Local psa-autogen testing has passed
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
travis-ci/tools-py3.5 Local tools-py3.5 testing has passed
Details
travis-ci/tools-py3.6 Local tools-py3.6 testing has passed
Details
travis-ci/tools-py3.7 Local tools-py3.7 testing has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.