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

ES Globals need cleanup #1181

Closed
jphickey opened this issue Feb 26, 2021 · 3 comments · Fixed by #1254 or #1258
Closed

ES Globals need cleanup #1181

jphickey opened this issue Feb 26, 2021 · 3 comments · Fixed by #1254 or #1258
Assignees
@jphickey
Labels
cFE-ES enhancement
Milestone
Caelum

Comments

@jphickey
Copy link
Contributor

Is your feature request related to a problem? Please describe.
The ES core app is quite disorganized in terms of its internal headers (what defines what) and global data structures. In particular there are three global data objects in this module.

cFE/fsw/cfe-core/src/es/cfe_es_task.h

Line 148 in c708d64

extern CFE_ES_TaskData_t CFE_ES_TaskData;

cFE/fsw/cfe-core/src/es/cfe_es_global.h

Line 161 in c708d64

extern CFE_ES_Global_t CFE_ES_Global;

cFE/fsw/cfe-core/src/es/cfe_es_global.h

Line 166 in c708d64

extern CFE_ES_ResetData_t *CFE_ES_ResetDataPtr;

Describe the solution you'd like
Make a single CFE_ES_Global object as was done for other apps in PR #1124. Further clean up/re-org the internal headers to create a more logical/consistent content would be nice.

Requester Info
Joseph Hickey, Vantage Systems, Inc.
@skliper skliper added this to the 7.0.0 milestone Feb 26, 2021
@skliper
Copy link
Contributor

skliper commented Feb 26, 2021

Just a guess - probably not all cleared at initialization either? Good catch, adding to the Caelum target.

@jphickey
Copy link
Contributor Author

I can do this but since it involves files I'm already moving around in #972 -- I need to postpone/defer until after that one is done (i.e. one re-org at a time).

@jphickey
Copy link
Contributor Author

And yes, looks like CFE_ES_Global is actively cleared, the task data is not.

jphickey added a commit that referenced this issue Mar 23, 2021
@jphickey
Fix #1181, global variable cleanup
e8f73aa 
Consolidate all ES global variables under a single CFE_ES_Global.

Removes the separate CFE_ES_TaskData as well as some random pointers
that were stored at global scope.

All references adjusted accordingly (search and replace).
@jphickey jphickey mentioned this issue Mar 23, 2021
Merged
@astrogeco astrogeco mentioned this issue Mar 25, 2021
Merged
jphickey added a commit that referenced this issue Mar 29, 2021
@jphickey
Merge pull request #1254 from jphickey/fix-1181-global-cleanup
3397016 
Fix #1181, global variable cleanup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@jphickey jphickey

Labels
cFE-ES enhancement
Projects
None yet
Milestone
Caelum
Development

Successfully merging a pull request may close this issue.

Fix #1181, global variable cleanup nasa/cFE
cFE Integration candidate: 2021-03-30 nasa/cFE
3 participants
@jphickey @skliper @astrogeco