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

Integration Candidate 2020-05-13 #712

Merged
merged 19 commits into from
May 22, 2020
Merged

Integration Candidate 2020-05-13 #712

merged 19 commits into from
May 22, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented May 19, 2020

Describe the contribution
Fix #309
Fix #657
Fix #679
Fix #681
Fix #684
Fix #707

Testing performed
Bundle CI - https://travis-ci.com/github/nasa/cFS/builds/167639047

Expected behavior changes
PR #673 - using ut stubs CFE_EVS_SendEvent and CFE_ES_WriteToSysLog, the register buffer will have the correct size. access to register buffer element will exist

PR #685 - Both the main task and the child task(s) are successfully deleted and restarted after the exception occurs.

PR #686 - Fixes doxygen warnings for the tbl subsystem.

PR #691 - No compiler warnings or errors on cross build.

PR #699 - Fixes a typo

PR #708 - Changes Message Key from uint16 to uint32 to avoid rollover and system hang

System(s) tested on
Bundle CI - Ubuntu:Bionic

Additional context
Part of nasa/cFS#87

See PRs for detailed changes and more testing information

Contributor Info - All information REQUIRED for consideration of pull request
Jose Tovias, CACI-LZT Technology
Joseph Hickey, Vantage Systems, Inc.
Christopher D. Knight, NASA-ARC
Jacob Hageman - NASA-GSFC

jphickey and others added 14 commits May 7, 2020 10:21
When cleaning up a task the child task resources should be
cleaned first, followed by the main task resources.

This is because child tasks are also associated with the original
creator within OSAL and will be found through OSAL ForEachObject,
and also via links within the ES task table.

By cleaning child tasks first, this avoids attempting to delete
the child task twice.
Resolve remaining alignment warnings in the unit test and stub code.
In es_UT.c test cases were passing a char* as a stack pointer (uint32*)
Memory pool code was also using uint8[] buffer as uint32.
Most casting becomes unnecessary when defined as the correct type.
Add missing UT_Stub_RegisterContext to CFE_EVS_SendEvent and CFE_ES_WriteToSysLog.
This will create the correct register buffer size.
Changes Message Key from uint16 to uint32 to avoid rollover
Fix #309, Typo in CFE_ES_RestartApp WriteToSysLog
Fix #657, Add UT_Stub_RegisterContext to CFE_EVS_SendEvent and CFE_ES_WriteToSysLog
@astrogeco astrogeco marked this pull request as draft May 20, 2020 15:25
@astrogeco astrogeco marked this pull request as ready for review May 22, 2020 15:47
@astrogeco astrogeco merged commit d217ca3 into master May 22, 2020
@skliper skliper added this to the 6.8.0 milestone Jun 1, 2020
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment