commit 4e2bf2c639cf769aaf26b742e4c11892189ae057
author Niklas Gürtler <Erlkoenig90@users.noreply.github.com> Thu Oct 13 19:22:24 2022 +0200
committer GitHub <noreply@github.com> Thu Oct 13 22:52:24 2022 +0530
tree 7d316c3e421f7b0100d1dbda956eb599fd4e6eb7
parent 1d20f0eba27f9fa9bf8d0a65604b399e07b9124e

Removed the 'configASSERT( xInheritanceOccurred == pdFALSE )' assertion from xQueueSemaphoreTake as the reasoning behind it is wrong; it can trigger on wrongly on highly-contested semaphores on multicore systems. See https://forums.freertos.org/t/15967 (#576)

Co-authored-by: Niklas Gürtler <niklas.guertler@tacterion.com>

queue.c

diff --git a/queue.c b/queue.c
index c7e759c..86dae0b 100644
--- a/queue.c
+++ b/queue.c
@@ -1604,15 +1604,6 @@
             {

                 if( xTicksToWait == ( TickType_t ) 0 )

                 {

-                    /* For inheritance to have occurred there must have been an

-                     * initial timeout, and an adjusted timeout cannot become 0, as

-                     * if it were 0 the function would have exited. */

-                    #if ( configUSE_MUTEXES == 1 )

-                    {

-                        configASSERT( xInheritanceOccurred == pdFALSE );

-                    }

-                    #endif /* configUSE_MUTEXES */

-

                     /* The semaphore count was 0 and no block time is specified

                      * (or the block time has expired) so exit now. */

                     taskEXIT_CRITICAL();