Skip to content

Conversation

@dmknutsen
Copy link
Contributor

@dmknutsen dmknutsen commented Apr 16, 2020

Describe the contribution
Updates CFE_TBL_CleanUpApp such that it now checks the 'used flag' prior to calling CFE_TBL_RemoveAccessLink for a given TblHandle. Also sets the AppId to CFE_TBL_NOT_OWNED after removing the access descriptor link from linked list.

Fix #121

Testing performed:

  1. Modified cfe_es_runloop such that if AppSate == cfe_es_appstate_waiting, then it will not return false. This was done to allow the restart command to work.
  2. Created a test app that uses tables.
  3. Modified table Noop command such that it prints out Table Access Descriptor data when received.
  4. Ran the following test - Note that I sent a noop after each step to review data (test results attached)
    a. Started CFE
    b. Deleted Test App
    c. Restarted Sample App
    d. Restarted Sample App

Ran test twice - Once to ensure I could recreate the error. Once to ensure changes corrected error.

  1. Ran unit tests

Expected behavior changes
Will no longer receive 'CFE_TBL:RemoveAccessLink-PutPoolBuf[0] Fail' error.

System(s) tested on
Oracle VM VirtualBox
OS: ubuntu-19.10
Versions: 6.7.12.0, OSAL 5.0.9.0, PSP 1.4.7.0

Contributor Info
Dan Knutsen
NASA/Goddard

issue_121_w_Fix.txt
issue_121_wo_Fix.txt

@skliper skliper added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Apr 16, 2020
@skliper skliper added this to the 6.8.0 milestone Apr 16, 2020
@skliper skliper changed the title Fixes 121, adds check for UsedFlag and sets APID to CFE_TBL_NOT_OWNED… Fix #121, Add check for UsedFlag and sets APID to CFE_TBL_NOT_OWNED Apr 16, 2020
@astrogeco astrogeco added the cFE-TBL Table services label Apr 21, 2020
@astrogeco
Copy link
Contributor

CCB 20200422 - Approved

@astrogeco astrogeco added CCB - 20200422 CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Apr 23, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate April 27, 2020 23:01
@astrogeco astrogeco merged commit 53cfc1e into nasa:integration-candidate Apr 28, 2020
@jphickey
Copy link
Contributor

This pull request also breaking the current integration candidate:

/home/joe/code/cfecfs/github/cfe/fsw/cfe-core/src/tbl/cfe_tbl_internal.c:1394:99: error: ‘TRUE’ undeclared (first use in this function)
 1394 |         if (CFE_TBL_TaskData.Handles[i].AppId == AppId && CFE_TBL_TaskData.Handles[i].UsedFlag == TRUE)
      |                                                                                                   ^~~~

Should be using true not TRUE here....

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 cFE-TBL Table services

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ES - Invalid Memory Handle When Restarting/Deleting an Application with Tables (GSFC DCR 14483)

4 participants