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 2020-10-07 #936

Merged
merged 13 commits into from
Oct 6, 2020
Merged

Integration Candidate 2020-10-07 #936

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
02b3a54
Fix #897, fix incorrect use of EventCount
jphickey Sep 22, 2020
f6ae2fb
Fix #651, Use resource ID for memory pools
jphickey Sep 29, 2020
a4ffe5b
Fix #923, Perform appid lookup early
jphickey Sep 30, 2020
5a64dd7
Merge pull request #898 from jphickey/fix-897-evs-unreg-appid
astrogeco Oct 1, 2020
948fa07
Merge pull request #925 from jphickey/fix-923-appid-lookups
astrogeco Oct 1, 2020
3a809eb
Merge pull request #917 from jphickey/fix-651-abstract-mempool-id
astrogeco Oct 1, 2020
71b8044
Fix #705, Use cFE defines to size arrays
skliper Sep 22, 2020
590025a
Update #899, Use sizeof() for output strings
jphickey Sep 30, 2020
7e755c3
Merge pull request #899 from skliper/fix705-rm-os-dependence
astrogeco Oct 2, 2020
3715b61
fix #888 - status code typedef
CDKnightNASA Oct 2, 2020
5d5cfac
Merge pull request #919 from CDKnightNASA/fix-888-return_code
astrogeco Oct 2, 2020
ac402f3
HOTFIX, correct doxygen refs
jphickey Oct 5, 2020
73479f7
Update ReadMe and set version to 6.8.0-rc1+dev122
astrogeco Oct 6, 2020
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
Prev Previous commit
Next Next commit
Fix #923, Perform appid lookup early 
Move the AppID lookup to be early in the CFE_SB_SendMsgFull implementation.
Avoids double locking between SB+ES and avoids a block-scope local variable.
  • Loading branch information
@jphickey
jphickey committed Sep 30, 2020
commit a4ffe5b522ee7afc69e1658941e50a21665040c9
16 changes: 7 additions & 9 deletions fsw/cfe-core/src/sb/cfe_sb_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,7 @@ int32 CFE_SB_SendMsgFull(CFE_SB_Msg_t *MsgPtr,
CFE_SB_BufferD_t *BufDscPtr;
uint16 TotalMsgSize;
CFE_SB_MsgRouteIdx_t RtgTblIdx;
CFE_ES_ResourceID_t AppId;
CFE_ES_ResourceID_t TskId;
uint32 i;
char FullName[(OS_MAX_API_NAME * 2)];
Expand All @@ -1205,6 +1206,9 @@ int32 CFE_SB_SendMsgFull(CFE_SB_Msg_t *MsgPtr,

SBSndErr.EvtsToSnd = 0;

/* get app id for loopback testing */
CFE_ES_GetAppID(&AppId);

/* get task id for events and Sender Info*/
CFE_ES_GetTaskID(&TskId);

Expand Down Expand Up @@ -1356,16 +1360,10 @@ int32 CFE_SB_SendMsgFull(CFE_SB_Msg_t *MsgPtr,

PipeDscPtr = &CFE_SB.PipeTbl[DestPtr->PipeId];

if(PipeDscPtr->Opts & CFE_SB_PIPEOPTS_IGNOREMINE)
if((PipeDscPtr->Opts & CFE_SB_PIPEOPTS_IGNOREMINE) != 0 &&
CFE_ES_ResourceID_Equal(PipeDscPtr->AppId, AppId))
{
CFE_ES_ResourceID_t AppId;

CFE_ES_GetAppID(&AppId);

if( CFE_ES_ResourceID_Equal(PipeDscPtr->AppId, AppId) )
{
continue;
}
continue;
}/* end if */

/* if Msg limit exceeded, log event, increment counter */
Expand Down