Merge pull request #1438 from skliper:fix1432-rtems_semaphore_returns

Fix #1432 #1411, RTEMS semaphore return bugs and functional test update
nasa · Jan 5, 2024 · 9f22539 · 9f22539
2 parents 1a8823f + 46c65e6
commit 9f22539
Show file tree

Hide file tree

Showing 6 changed files with 335 additions and 373 deletions.
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/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;
 }