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

osal Integration candidate: 2021-04-06 #951

Merged
merged 10 commits into from
Apr 8, 2021
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 8, 2021

Description

PR #931

Fix #916, scrub include guards

Replaces nonstandard header file block comments and include guards. No behavior changes

PR #937

Fix #844, switch to use CLOCK_REALTIME

Removes CLOCK_MONOTONIC as the osal colck source since PSP no longer needs it. OS_GetLocalTime() and OS_SetLocalTime() will work as described.

PR #938

Fix #887, specify shell name in ShellOutputToFile

Replaces shellName with a specific localShellName that can be polled safely and changes its type to a char of OS_MAX_API_NAME length for safety.

Context

Part of nasa/cFS#238

Tests

osal checks https://github.com/nasa/osal/pull/951/checks
cFS bundle checks https://github.com/nasa/cFS/pull/238/checks

jphickey and others added 7 commits March 25, 2021 11:07
Ensure all headers have a consistent include guard and file block comment
This gets all FSW code within src/os and src/bsp.
Ensure all headers have a consistent include guard and file block comment
This gets all unit tests (function, not coverage) and ut assert
Scrub all include guards and file scope doxygen comments in
src/unit-test-coverage
Filter out author and creation date info (not relevant)
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.
Rather than using a default name, use a specific name so that
it can be polled more safely.
@astrogeco astrogeco marked this pull request as draft April 8, 2021 02:26
Fix #887, specify shell name in ShellOutputToFile
@astrogeco astrogeco merged commit ba0ac40 into main Apr 8, 2021
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
@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
None yet
Projects
None yet
3 participants