From f81f974eeb2c2ac33bed92e4096d5eba1463b32b Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Fri, 12 Mar 2021 16:07:36 -0500 Subject: [PATCH] Fix #883, remove unreachable test The only way for this test happen would be if somehow the normal unlock process was bypassed. --- src/os/shared/src/osapi-mutex.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/os/shared/src/osapi-mutex.c b/src/os/shared/src/osapi-mutex.c index 93cc0e92f..fb07100cd 100644 --- a/src/os/shared/src/osapi-mutex.c +++ b/src/os/shared/src/osapi-mutex.c @@ -198,7 +198,6 @@ int32 OS_MutSemTake(osal_id_t sem_id) OS_mutex_internal_record_t *mutex; OS_object_token_t token; int32 return_code; - osal_id_t self_task; /* Check Parameters */ return_code = OS_ObjectIdGetById(OS_LOCK_MODE_NONE, LOCAL_OBJID_TYPE, sem_id, &token); @@ -209,16 +208,8 @@ int32 OS_MutSemTake(osal_id_t sem_id) return_code = OS_MutSemTake_Impl(&token); if (return_code == OS_SUCCESS) { - self_task = OS_TaskGetId(); - - if (OS_ObjectIdDefined(mutex->last_owner)) - { - OS_DEBUG("WARNING: Task %lu taking mutex %lu while owned by task %lu\n", - OS_ObjectIdToInteger(self_task), OS_ObjectIdToInteger(sem_id), - OS_ObjectIdToInteger(mutex->last_owner)); - } - - mutex->last_owner = self_task; + /* Always set the owner if OS_MutSemTake_Impl() returned success */ + mutex->last_owner = OS_TaskGetId(); } }