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

cFE Integration candidate: 2021-08-24 #1839

Merged
merged 59 commits into from
Aug 21, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
ad4dba7
Fix #1805, Add test for ES BackgroundWakeup
nmullane Aug 12, 2021
25ead32
Fix #1807, increase SB pool max size bucket
jphickey Aug 13, 2021
94360e7
Fix #1786, Success Test for CFE_ES_RestartApp
arielswalker Aug 13, 2021
902255b
Fix #1787, Success Test for CFE_ES_GetMemPoolStats
arielswalker Aug 13, 2021
e8a13eb
Fix #1821, Group MSG APIs documentation by header type
skliper Aug 16, 2021
7fae7dd
Fix #472, Increase tbl line coverage
nmullane Aug 16, 2021
089f34b
Fix #1792, Add success test for tbl update
nmullane Aug 16, 2021
8fb3b84
Fix #1793, Add success and fail test tbl validate
nmullane Aug 17, 2021
826e9f4
Fix #1831, Consolidate msg get/set doxygen group
skliper Aug 17, 2021
0f3f9e9
Fix #1824, Add missing cases for msg id func tests
zanzaben Aug 17, 2021
19374f5
Fix #1680, add SB subscription functional test
jphickey Aug 11, 2021
b66f476
Fix #1755, separate variable for OSAL status
jphickey Aug 3, 2021
42897cf
Fix #1755, separate variable for PSP status
jphickey Aug 3, 2021
901f135
Fix #1786, Set up app and apply format for Restart App UT
skliper Aug 17, 2021
81df083
Fix #1794, Subscribe Message Limit Greater CFE_PLATFORM_SB_DEFAULT_MS…
arielswalker Aug 13, 2021
7cde4fe
Fix #1681, add SB message passing functional test
jphickey Aug 11, 2021
9c66b21
Fix #1682, add SB zero copy functional tests
jphickey Aug 11, 2021
6c52f00
Fix #1795, test boundary condition on GetAddresses
nmullane Aug 18, 2021
352a9e5
Fix #1791, Add tests for TBL ReleaseAddresses
nmullane Aug 18, 2021
1715a32
Fix #1789, Add success test for TBL GetStatus
nmullane Aug 18, 2021
73fd3a5
Fix #1788, Add tests for TBL DumpToBuffer
nmullane Aug 18, 2021
3931e45
Merge pull request #1803 from jphickey/fix-1680-1681-1682-test-sb-msg
astrogeco Aug 18, 2021
47eb39d
Merge pull request #1756 from jphickey/fix-1755-osstatus-variable
astrogeco Aug 18, 2021
e3b1707
Merge pull request #1809 from jphickey/fix-1807-sb-pool-maxsize
astrogeco Aug 18, 2021
aa72f85
Fix #1840, Add Null check for CFE_ResourceId_FindNext
zanzaben Aug 18, 2021
b8df511
Merge pull request #1842 from zanzaben/fix1840_ResourceID_FindNext_nu…
astrogeco Aug 18, 2021
e879296
Fix #1840, Hotfix for strict resource IDs.
zanzaben Aug 18, 2021
41b0ea2
Merge pull request #1844 from zanzaben/fix1840_ResourceID_FindNext_nu…
astrogeco Aug 18, 2021
8ef6df7
Merge pull request #1828 from nmullane/fix472-improve-tbl-line-coverage
astrogeco Aug 19, 2021
506975d
Merge pull request #1833 from zanzaben/fix1824_finish_messege_id_func…
astrogeco Aug 19, 2021
f1a8f74
Merge pull request #1832 from skliper/fix1831-sb_dox_groups
astrogeco Aug 19, 2021
52f77e3
Fix #1815, add retroactive CFE status asserts
jphickey Aug 13, 2021
eec8ec9
Fix #473 Adding coverage tests to cFE TIME
pepepr08 Aug 13, 2021
1aef656
HOTFIX IC-20210819, type correction TBL coverage test
jphickey Aug 19, 2021
823d772
Fix #1847, enable strict resource id w/OMIT_DEPRECATED
jphickey Aug 19, 2021
54612f1
Merge pull request #1836 from pepepr08/fix473-time-coverage
astrogeco Aug 19, 2021
87ae806
Fix #1851, remove unused CFE_TBL_ERR_BAD_APP_ID
jphickey Aug 19, 2021
5bcc8fb
Fix #1852, correct syslog message in pool create
jphickey Aug 19, 2021
369696a
Fix #1850, remove unused CFE_ES_POOL_BOUNDS_ERROR
jphickey Aug 19, 2021
748b6f7
Fix #1827 Check error ctr to TransmitMsg test
pepepr08 Aug 19, 2021
9a2ff6c
Fix #1771, End Child Task requirement remove error code
skliper Aug 20, 2021
5f6aaf8
Fix #1858, remove unused CFE_TBL_ERR_FILE_NOT_FOUND
jphickey Aug 20, 2021
82deffb
Merge pull request #1848 from jphickey/fix-1847-enable-strict-resourceid
astrogeco Aug 20, 2021
4cc132c
Merge pull request #1845 from jphickey/hotfix-ic-20210818
astrogeco Aug 20, 2021
d02ccd8
Fix #1679, Add functional tests for resource misc
nmullane Aug 10, 2021
49a5db1
Merge pull request #1806 from nmullane/fix1805-add-es-test-for-backgr…
astrogeco Aug 20, 2021
c79d40e
Merge pull request #1813 from ArielSAdamsNASA/fix-1786-success-test-c…
astrogeco Aug 20, 2021
f2bcc5e
Merge pull request #1814 from ArielSAdamsNASA/fix-1794-message-limit-…
astrogeco Aug 20, 2021
09c3b4d
Merge pull request #1811 from ArielSAdamsNASA/fix-1787-success-test-c…
astrogeco Aug 20, 2021
752faed
Merge pull request #1822 from skliper/fix1821-msg_api_grouping
astrogeco Aug 20, 2021
1a29d37
Merge pull request #1816 from jphickey/fix-1815-utassert-retroactive
astrogeco Aug 20, 2021
dd32187
Merge pull request #1854 from jphickey/fix-1851-tbl-appid-err
astrogeco Aug 20, 2021
d5f6670
Merge pull request #1855 from jphickey/fix-1852-syslog-msg
astrogeco Aug 20, 2021
d00bce1
Merge pull request #1853 from jphickey/fix-1850-pool-bounds-err
astrogeco Aug 20, 2021
c729862
Merge pull request #1859 from jphickey/fix-1858-tbl-filenotfound-err
astrogeco Aug 20, 2021
e4150b0
Merge pull request #1856 from pepepr08/fix1827-sb-errorctr
astrogeco Aug 20, 2021
871c791
Merge pull request #1857 from skliper/fix1771-end_child_task_void
astrogeco Aug 20, 2021
95ec6d0
Merge pull request #1782 from nmullane/fix1679-resource-misc-function…
astrogeco Aug 20, 2021
ac66332
IC:2021-08-24, Bump to v6.8.0-rc1+dev933
astrogeco Aug 20, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions modules/core_api/fsw/inc/cfe_error.h
Original file line number Diff line number Diff line change
Expand Up @@ -600,15 +600,6 @@ typedef int32 CFE_Status_t;
*/
#define CFE_ES_POOL_BLOCK_INVALID ((CFE_Status_t)0xc400002C)

/**
* @brief Invalid pool size or buffer address
*
* A specified pool address or size is outside the acceptable
* bounds for that pool configuration.
*
*/
#define CFE_ES_POOL_BOUNDS_ERROR ((CFE_Status_t)0xc400002D)

/**
* @brief Duplicate Name Error
*
Expand Down
1 change: 0 additions & 1 deletion modules/core_api/fsw/inc/cfe_es.h
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,6 @@ CFE_Status_t CFE_ES_PoolCreate(CFE_ES_MemHandle_t *PoolID, void *MemPtr, size_t
** \retval #CFE_SUCCESS \copybrief CFE_SUCCESS
** \retval #CFE_ES_BAD_ARGUMENT \copybrief CFE_ES_BAD_ARGUMENT
** \retval #CFE_ES_NO_RESOURCE_IDS_AVAILABLE \copybrief CFE_ES_NO_RESOURCE_IDS_AVAILABLE
** \retval #CFE_ES_POOL_BOUNDS_ERROR \copybrief CFE_ES_POOL_BOUNDS_ERROR
** \retval #CFE_STATUS_EXTERNAL_RESOURCE_FAIL \copybrief CFE_STATUS_EXTERNAL_RESOURCE_FAIL
**
** \sa #CFE_ES_PoolCreate, #CFE_ES_PoolCreateNoSem, #CFE_ES_GetPoolBuf, #CFE_ES_PutPoolBuf, #CFE_ES_GetMemPoolStats
Expand Down
5 changes: 0 additions & 5 deletions modules/es/fsw/src/cfe_es_mempool.c
Original file line number Diff line number Diff line change
Expand Up @@ -350,11 +350,6 @@ CFE_Status_t CFE_ES_PoolCreateEx(CFE_ES_MemHandle_t *PoolID, void *MemPtr, size_
*/
CFE_ES_MemPoolRecordSetFree(PoolRecPtr);
PendingID = CFE_RESOURCEID_UNDEFINED;

if (Status == CFE_ES_POOL_BOUNDS_ERROR)
{
CFE_ES_WriteToSysLog("%s: Pool size(%lu) too small\n", __func__, (unsigned long)Size);
}
}

/*
Expand Down