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.

Sign up for GitHub

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

Jump to bottom

Integration Candidate 20191230 #334

Merged
merged 15 commits into from
Jan 8, 2020
Merged

Integration Candidate 20191230 #334

merged 15 commits into from
Jan 8, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Dec 31, 2019 •
edited
Loading

Describe the contribution
1st merge: Fix #295, Fix #298, Fix #305, Fix #307, Fix #308,
Fix #313, Fix #314, Fix #316, Fix #321, Fix #323

2nd merge: Fix #297

Testing performed

  1. Checked out all IC 20191230 branches
  2. Built and ran cFS unit tests and OSAL coverage (vxworks and shared)
    1. All passed (although osal_timer_UT occasionally still fails due to a test issue)
  3. Make cmdUtils where cFS-GroundSystem expects it
    1. cd tools/cFS-GroundSystem/Subsystems/cmdUtil
    2. make
  4. Started Ground system
    1. python3 GroundSystem.py
  5. Enabled commands to 127.0.0.1
  6. Confirmed telemetry packets received
  7. Sent ES and TIME noop commands, confirmed noop message from cFS on Port 1
  8. Sent ES power on reset and observed cFS exit

Expected behavior changes
See related pull requests

System(s) tested on

  • cFS Dev Server 2
  • OS: Ubuntu 18.04
  • Versions: ic-20191230 branches

Additional context
N/A

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

jphickey and others added 14 commits December 13, 2019 16:10
@jphickey
Fix #297: Refactor OSAL C library stubs
a2a97b7 
Rather than utilizing a separate "stub-map-to-real.h" file that would
need to be injected into the build of the unit under test, this builds
the mappings into the mapping into the override files themselves.

The stub functions are then moved into a separate header under a
unique name with an OCS_ prefix.

This introduces a number of new files, as what previously required
a single header now requires two, but it it eliminates the separate
map file.
@jphickey @skliper
Fix #295: Add alignment wrapper to OS_SockAddr_t
25b9efd 
Add a union wrapper for the abstract data field such that it will
be aligned for 32 bit integer values and/or pointers, whichever is
greater.

This should be sufficient for casting to the system "struct sockaddr"
@jphickey @skliper
Fix #298: Fix minor warnings in OSAL code
1cc97c3 
Fix warnings that are triggered by compiling the OSAL coverage
unit test with strict settings.

- The OS_FPUExcAttachHandler function needs to be prototyped
  as accepting a function pointer (not void*)
- Const-Correctness on OS_ModuleLoad_Impl()
- Use void* instead of char* for buffer pointer as the specific
  type is not known
- Cast the function passed into taskSpawn on VxWorks
@jphickey @skliper
Fix #298: Clean up warnings in UT code with strict settings
31cc6ae 
Additional compiler warning fixes for the UT code itself.
This is committed separately from the changes that affect
the OSAL FSW code.
@skliper
issue #305, Resolve cppcheck warning ut_stubs
40c574f
@skliper
issue #308, Resolve cpp warning in os dir.
ca742b0
@skliper
issue #307, Remove unsupported BSPs
8c4355b
@skliper
issue #314, adding travis.yml for cppcheck
a3bf878
@jphickey @skliper
Fix #316: Exception/Interrupt API updates
3c30fd0 
- Ensure the FPU functions that are actually not implemented in
  RTEMS/POSIX all return OS_ERR_NOT_IMPLEMENTED, not OS_SUCCESS.
- The RTEMS IntEnable/Disable API should not be a duplicate of
  the IntLock/Unlock API, as the semantics are slightly different.
  The Enable/Disable API should return OS_ERR_NOT_IMPLEMENTED.
- The OS_FPUExcGetMask API should confirm that the output buffer
  is not NULL.
@jphickey @skliper
Fix #313: Use UT assert for OSAL unit tests
b1bf346 
Modify the "unit-tests" (extended/functional tests) for OSAL to use
the UT assert library for test case reporting and platform support.

Reduce or eliminate the use of macros for platform abstraction
wherever possible.  This removes most platform-specific logic from
the test cases, leaving that to the OSAL/BSP abstraction.
@jphickey @skliper
Fix #321: Update OS_VxWorks_SigWait test case
cb259b9 
This is related to the change for #271, where the return value
of this function depends on the configured timer interval.  The
coverage test case for this was not updated in the original change.
@jphickey @skliper
Fix #323: Avoid infinite sem-speed-test
e8a1db7 
1. Add a hard limit to the execution (work) counter for the
sem-speed-test worker threads.  With this they will self-exit
eventually even if the root task never gets CPU time to stop them.

2. Set the priority of the worker tasks to be logically lower, so
it is less likely to preempt the main task.

Note that the logical priority is inverted from the numeric value.
@skliper
CCB 20191218: Merge #296 #299 #306 #310 #311 #315 #317 #318 #322 #324
9e3027f 
Fix #295, #298, #305, #307, #308,
    #313, #314, #316, #321, #323
Reviewed and approved at 2019-12-18 CCB
@jphickey
Update #297: Add copyright header
49e2bf2 
Adds a NOSA copyright header to all files touched
as part of the fix for #297.
@skliper
Copy link
Contributor Author

skliper commented Dec 31, 2019

Reran cFS unit tests and osal coverage tests after push of d14743c, all passed.

@skliper
CCB 20191218: Merge #319
623a5af 
Fix #297
Reviewed and approved at 2019-12-18 CCB
@skliper
Copy link
Contributor Author

skliper commented Dec 31, 2019

Fixed the merge comment (referenced #317 instead of #319)

@skliper skliper added this to the 5.1.0 milestone Jan 2, 2020
@skliper
Copy link
Contributor Author

skliper commented Jan 2, 2020

Note that #318 also fixes #58

@skliper skliper merged commit 623a5af into master Jan 8, 2020
@skliper skliper deleted the ic-20191230 branch January 8, 2020 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Bootes
2 participants
@skliper @jphickey