Merge branch 'main' into fix-1420

nasa · Jan 17, 2024 · 9de67c9 · 9de67c9
2 parents 089bf8d + 06e028c
commit 9de67c9
Show file tree

Hide file tree

Showing 15 changed files with 352 additions and 786 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v6.0.0-rc4+dev251
+- RTEMS semaphore return bugs and functional test update
+- See <https://github.com/nasa/osal/pull/1438>
+
 ## Development Build: v6.0.0-rc4+dev247
 - adjust pthread stack to account for TCB+TLS
 - See <https://github.com/nasa/osal/pull/1430>

diff --git a/src/os/inc/osapi-binsem.h b/src/os/inc/osapi-binsem.h
@@ -193,6 +193,7 @@ int32 OS_BinSemGetIdByName(osal_id_t *sem_id, const char *sem_name);
  * @retval #OS_SUCCESS @copybrief OS_SUCCESS
  * @retval #OS_ERR_INVALID_ID if the id passed in is not a valid semaphore
  * @retval #OS_INVALID_POINTER if the bin_prop pointer is null
+ * @retval #OS_ERR_NOT_IMPLEMENTED @copybrief OS_ERR_NOT_IMPLEMENTED
  */
 int32 OS_BinSemGetInfo(osal_id_t sem_id, OS_bin_sem_prop_t *bin_prop);
 

diff --git a/src/os/inc/osapi-countsem.h b/src/os/inc/osapi-countsem.h
@@ -176,6 +176,7 @@ int32 OS_CountSemGetIdByName(osal_id_t *sem_id, const char *sem_name);
  * @retval #OS_SUCCESS @copybrief OS_SUCCESS
  * @retval #OS_ERR_INVALID_ID if the id passed in is not a valid semaphore
  * @retval #OS_INVALID_POINTER if the count_prop pointer is null
+ * @retval #OS_ERR_NOT_IMPLEMENTED @copybrief OS_ERR_NOT_IMPLEMENTED
  */
 int32 OS_CountSemGetInfo(osal_id_t sem_id, OS_count_sem_prop_t *count_prop);
 

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER     247
+#define OS_BUILD_NUMBER     251
 #define OS_BUILD_BASELINE   "equuleus-rc1"
 #define OS_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define OS_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */

diff --git a/src/os/rtems/src/os-impl-binsem.c b/src/os/rtems/src/os-impl-binsem.c
@@ -251,7 +251,7 @@ int32 OS_BinSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs)
 
     status = rtems_semaphore_obtain(impl->id, option_set, TimeInTicks);
 
-    if (status == RTEMS_TIMEOUT)
+    if (status == RTEMS_TIMEOUT || (option_set == RTEMS_NO_WAIT && status == RTEMS_UNSATISFIED))
     {
         return OS_SEM_TIMEOUT;
     }
@@ -275,5 +275,5 @@ int32 OS_BinSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs)
 int32 OS_BinSemGetInfo_Impl(const OS_object_token_t *token, OS_bin_sem_prop_t *bin_prop)
 {
     /* RTEMS has no API for obtaining the current value of a semaphore */
-    return OS_SUCCESS;
+    return OS_ERR_NOT_IMPLEMENTED;
 }
diff --git a/src/os/rtems/src/os-impl-countsem.c b/src/os/rtems/src/os-impl-countsem.c
@@ -216,7 +216,7 @@ int32 OS_CountSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs)
 
     status = rtems_semaphore_obtain(impl->id, option_set, TimeInTicks);
 
-    if (status == RTEMS_TIMEOUT)
+    if (status == RTEMS_TIMEOUT || (option_set == RTEMS_NO_WAIT && status == RTEMS_UNSATISFIED))
     {
         return OS_SEM_TIMEOUT;
     }
@@ -239,5 +239,5 @@ int32 OS_CountSemTimedWait_Impl(const OS_object_token_t *token, uint32 msecs)
 int32 OS_CountSemGetInfo_Impl(const OS_object_token_t *token, OS_count_sem_prop_t *count_prop)
 {
     /* RTEMS does not provide an API to get the value */
-    return OS_SUCCESS;
+    return OS_ERR_NOT_IMPLEMENTED;
 }
diff --git a/src/os/shared/src/osapi-version.c b/src/os/shared/src/osapi-version.c
@@ -48,7 +48,7 @@ const char *OS_GetVersionString(void)
  *-----------------------------------------------------------------*/
 const char *OS_GetVersionCodeName(void)
 {
-    return OS_VERSION_CODENAME;
+    return OS_BUILD_CODENAME;
 }
 
 /*----------------------------------------------------------------

diff --git a/src/tests/bin-sem-flush-test/bin-sem-flush-test.c b/src/tests/bin-sem-flush-test/bin-sem-flush-test.c