From 7bf98769e93e51f6679b7648deb07cdb8c1cd2f6 Mon Sep 17 00:00:00 2001 From: anh Date: Wed, 11 Mar 2020 13:29:00 -0400 Subject: [PATCH 1/3] Fix #19, Release table address Add CFE_TBL_ReleaseAddress after access of table data. --- fsw/src/sample_app.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c index 11fa6d1..0069a61 100644 --- a/fsw/src/sample_app.c +++ b/fsw/src/sample_app.c @@ -451,6 +451,14 @@ int32 SAMPLE_Process( const SAMPLE_Process_t *Msg ) SAMPLE_GetCrc(TableName); + status = CFE_TBL_ReleaseAddress(Sample_AppData.TblHandles[0]); + if (status != CFE_SUCCESS) + { + CFE_ES_WriteToSysLog("Sample App: Fail to release table address: 0x%08lx", + (unsigned long)status); + return; + } + /* Invoke a function provided by SAMPLE_LIB */ SAMPLE_Function(); From 4f40a9579d92401cc0e1f750bba1534d26db6417 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 1 Apr 2020 10:22:19 -0400 Subject: [PATCH 2/3] Increase version to 1.1.7 and update ReadMe --- README.md | 4 +++- fsw/src/sample_app_version.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0164775..768b63f 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,9 @@ This sample application is a non-flight example application implementation for t sample_app is an example for how to build and link an application in cFS. ## Version Notes - +- 1.1.7 + - Fix bug where table is not released after being used + - Minor updates (see https://github.com/nasa/sample_app/pull/48) - 1.1.6 - Minor updates (see https://github.com/nasa/sample_app/pull/49) - 1.1.5 diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index d603083..cb30f66 100644 --- a/fsw/src/sample_app_version.h +++ b/fsw/src/sample_app_version.h @@ -33,7 +33,7 @@ #define SAMPLE_APP_MAJOR_VERSION 1 #define SAMPLE_APP_MINOR_VERSION 1 -#define SAMPLE_APP_REVISION 6 +#define SAMPLE_APP_REVISION 7 #define SAMPLE_APP_MISSION_REV 0 From 34321ff63222b5b6a19d967fcbc23bd45bc95a63 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 3 Apr 2020 13:57:27 -0400 Subject: [PATCH 3/3] Integration Fix: Make Sample_AppData uppercase and add missing "status" to return --- fsw/src/sample_app.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fsw/src/sample_app.c b/fsw/src/sample_app.c index 0069a61..82e51e1 100644 --- a/fsw/src/sample_app.c +++ b/fsw/src/sample_app.c @@ -451,12 +451,12 @@ int32 SAMPLE_Process( const SAMPLE_Process_t *Msg ) SAMPLE_GetCrc(TableName); - status = CFE_TBL_ReleaseAddress(Sample_AppData.TblHandles[0]); + status = CFE_TBL_ReleaseAddress(SAMPLE_AppData.TblHandles[0]); if (status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("Sample App: Fail to release table address: 0x%08lx", (unsigned long)status); - return; + return status; } /* Invoke a function provided by SAMPLE_LIB */