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

cFE Integration candidate: Equuleus-rc1+dev11 #2549

Merged

dzbaker merged 3 commits into main from integration-candidate

Apr 16, 2024

Collaborator

dzbaker commented Apr 16, 2024 •

edited

Loading

Checklist (Please check before submitting)

I reviewed the Contributing Guide.
I signed and emailed the appropriate Contributor License Agreement to GSFC-SoftwareRelease@mail.nasa.gov and copied cfs-program@lists.nasa.gov.

Describe the contribution

PR Fix #2546, add handle list operation routines #2548. Addresses Issue Add "foreach" function for access descriptor looping #2546

Testing performed
cFS Bundle Checks
cFE Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey

jphickey and others added 3 commits

April 5, 2024 15:15


          Fix #2546, add handle list operation routines

b13c79f

Adds a "HandleLink" structure to encapsulate the linked list
functionality and add generic routines to initialize and test/check
this structure, along with list insert/remove functions for
access descriptors that use this link struct interally.

This also cleans up documentation of the table resource ID functions
defined in cfe_tbl_resource.h


          Merge pull request #2548 from jphickey:fix-2546-foreach-accessdesc

012d62a

Fix #2546, add handle list operation routines


          Updating documentation and version numbers for equuleus-rc1+dev131

5c84059

github-advanced-security bot found potential problems

View reviewed changes

modules/tbl/fsw/src/cfe_tbl_internal.c

+                          break;
+                      }
+                      Func(AccDescPtr, Arg);

Check notice

Code scanning / CodeQL

Use of non-constant function pointer Note

This call does not go through a const function pointer.

modules/tbl/fsw/src/cfe_tbl_internal.c

+               * See description in header file for argument/return detail
+               *
+               *-----------------------------------------------------------------*/
+              void CFE_TBL_HandleListInsertLink(CFE_TBL_RegistryRec_t *RegRecPtr, CFE_TBL_AccessDescriptor_t *AccessDescPtr)

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.

modules/tbl/fsw/src/cfe_tbl_internal.c

+               * See description in header file for argument/return detail
+               *
+               *-----------------------------------------------------------------*/
+              void CFE_TBL_HandleListRemoveLink(CFE_TBL_RegistryRec_t *RegRecPtr, CFE_TBL_AccessDescriptor_t *AccessDescPtr)

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.

modules/tbl/fsw/src/cfe_tbl_internal.c

+               * See description in header file for argument/return detail
+               *
+               *-----------------------------------------------------------------*/
+              void CFE_TBL_ForeachAccessDescriptor(CFE_TBL_RegistryRec_t *RegRecPtr, CFE_TBL_AccessDescFunc_t Func, void *Arg)

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.

modules/tbl/fsw/src/cfe_tbl_internal.c

+               * See description in header file for argument/return detail
+               *
+               *-----------------------------------------------------------------*/
+              void CFE_TBL_HandleListGetSafeLink(CFE_TBL_RegistryRec_t *RegRecPtr, CFE_TBL_AccessDescriptor_t *AccDescPtr,

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.

modules/tbl/fsw/src/cfe_tbl_api.c

+                  CFE_TBL_TxnState_t *Txn = Arg;
+                  /* Only notify *OTHER* applications that the contents have changed */
+                  if (!CFE_RESOURCEID_TEST_EQUAL(AccessDescPtr->AppId, CFE_TBL_TxnAppId(Txn)))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning

This Boolean expression is not side-effect free.

modules/tbl/fsw/src/cfe_tbl_transaction.c

    
                  /* Return the Access Descriptor to the pool */

                  AccessDescPtr->UsedFlag = false;

                  /* If this was the last Access Descriptor for this table, we can free the memory buffers as well */

                  if (RegRecPtr->HeadOfAccessList == CFE_TBL_END_OF_LIST)

                  if (!CFE_TBL_HandleLinkIsAttached(&RegRecPtr->AccessList))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning

This Boolean expression is not side-effect free.

modules/tbl/fsw/src/cfe_tbl_transaction.c

Comment on lines +236 to +237

		if (AccDescPtr->UsedFlag && AccDescPtr->RegIndex == CFE_TBL_TxnRegId(Txn) &&
		CFE_RESOURCEID_TEST_EQUAL(AccDescPtr->AppId, CFE_TBL_TxnAppId(Txn)))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning

This Boolean expression is not side-effect free.

modules/tbl/fsw/src/cfe_tbl_internal.h

+               * \param AccDescPtr Pointer to the current access descriptor
+               * \param Arg Opaque argument from caller (passed through)
+               */
+              typedef void (* const CFE_TBL_AccessDescFunc_t)(CFE_TBL_AccessDescriptor_t *AccDescPtr, void *Arg);

Check notice

Code scanning / CodeQL

Hidden pointer indirection Note

The typedef CFE_TBL_AccessDescFunc_t hides pointer indirection.

dzbaker merged commit 28a5820 into main

40 of 41 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet