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 #844, switch to use CLOCK_REALTIME #937

Merged
merged 1 commit into from
Apr 8, 2021

Conversation

jphickey
Copy link
Contributor

Describe the contribution
The portable clock_gettime implementation had been using CLOCK_MONOTONIC to support its use as a PSP timebase for some platforms that used it this way. However with updates on the PSP side this is not required anymore.

Preference should be to use CLOCK_REALTIME as it better aligns with the described semantics of the OSAL clock function, and makes for a better default. This can still be easily changed back if the user desires.

Fixes #844

Testing performed
Build and sanity check CFE, run all unit tests

Expected behavior changes
OS_GetLocalTime() and OS_SetLocalTime() will work as described.

System(s) tested on
Ubuntu 20.04

Additional context
This depends on not using the OSAL clock as a monotonic timebase. nasa/PSP#285 is required to fix this.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

The portable clock_gettime implementation had been using CLOCK_MONOTONIC
to support its use as a PSP timebase for some platforms that used it this
way.  However with updates on the PSP side this is not required anymore.

Preference should be to use CLOCK_REALTIME as it better aligns with the
described semantics of the OSAL clock function, and makes for a better
default.  This can still be easily changed back if the user desires.
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Mar 31, 2021
@astrogeco
Copy link
Contributor

CCB:2021-03-31 APPROVED

@astrogeco astrogeco changed the base branch from main to integration-candidate April 8, 2021 02:30
@astrogeco astrogeco added CCB:Approved Indicates code review and approval by community CCB IC:2021-04-06 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 8, 2021
@astrogeco astrogeco merged commit 39c1bcf into nasa:integration-candidate Apr 8, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 8, 2021
nasa/osal#931 - Scrub include guards

nasa/osal#937 - Switch to use CLOCK_REALTIME

nasa/osal#938 - Specify shell name in ShellOutputToFile
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 8, 2021
Combines:

nasa/cFE#1284
nasa/osal#951
nasa/PSP#289

Including:

nasa/cFE#1251 - ES Info API Functional test

nasa/osal#931 - Scrub include guards
nasa/osal#937 - Switch to use CLOCK_REALTIME
nasa/osal#938 - specify shell name in ShellOutputToFile

nasa/PSP#286 - use OSAL timebase for CFE timers
nasa/PSP#282 - modularize the ram, port, and eenasa/psp#om access
nasa/PSP#285 - add psp module to implement timebase
@jphickey jphickey deleted the fix-844-clock-time branch April 28, 2021 18:58
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clarify OS_GetLocalTime/OS_SetLocalTime use in relation to OSAL_GETTIME_SOURCE_CLOCK
3 participants