len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-10-14 08:47:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix rendezvous test failure in EventGroupsDemo (#294)

Browse source 
The rendezvous test in EventGroupsDemo assumed that one tick is not
enough for rendezvous to complete. Turns out that it is not true on a
system with 1ms tick and rendezvous does get complete within one tick.
This commit removes the test with one tick assumption.

Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>
This commit is contained in:
Gaurav-Aggarwal-AWS 2020-09-24 10:24:33 -07:00 • committed by GitHub
parent dea347fb9a
commit de502afcb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c
View file

@ -78,7 +78,6 @@ that synchronise with the xEventGroupSync() function. */
/* A block time of zero simply means "don't block". */ /* A block time of zero simply means "don't block". */
#define ebDONT_BLOCK ( 0 ) #define ebDONT_BLOCK ( 0 )
#define ebONE_TICK ( ( TickType_t ) 1 )
/* A 5ms delay. */ /* A 5ms delay. */
#define ebSHORT_DELAY pdMS_TO_TICKS( ( TickType_t ) 5 ) #define ebSHORT_DELAY pdMS_TO_TICKS( ( TickType_t ) 5 )
@ -290,10 +289,9 @@ EventBits_t uxSynchronisationBit, uxReturned;
/* Set the bit that indicates this task is at the synchronisation /* Set the bit that indicates this task is at the synchronisation
point. The first time this is done the 'test master' task has a lower point. The first time this is done the 'test master' task has a lower
priority than this task so this task will get to the sync point before priority than this task so this task will get to the sync point before
the set bits task - test this by first calling xEventGroupSync() with the set bits task - test this by calling xEventGroupSync() with a zero
a zero block time, and a block time that is too short for the other block time before calling again with a max delay - the first call should
task, before calling again with a max delay - the first two calls should return before the rendezvous completes, the second only after the
return before the rendezvous completes, the third only after the
rendezvous is complete. */ rendezvous is complete. */
uxReturned = xEventGroupSync( xEventGroup, /* The event group used for the synchronisation. */ uxReturned = xEventGroupSync( xEventGroup, /* The event group used for the synchronisation. */
uxSynchronisationBit, /* The bit to set in the event group to indicate this task is at the sync point. */ uxSynchronisationBit, /* The bit to set in the event group to indicate this task is at the sync point. */
@ -304,15 +302,6 @@ EventBits_t uxSynchronisationBit, uxReturned;
rendezvous is not expected to have completed yet. */ rendezvous is not expected to have completed yet. */
configASSERT( ( uxReturned & ebALL_SYNC_BITS ) != ebALL_SYNC_BITS ); configASSERT( ( uxReturned & ebALL_SYNC_BITS ) != ebALL_SYNC_BITS );
uxReturned = xEventGroupSync( xEventGroup, /* The event group used for the synchronisation. */
uxSynchronisationBit, /* The bit to set in the event group to indicate this task is at the sync point. */
ebALL_SYNC_BITS, /* The bits to wait for - these bits are set by the other tasks taking part in the sync. */
ebONE_TICK ); /* The maximum time to wait for the sync condition to be met before giving up. */
/* A short block time was specified, so as per the comments above, the
rendezvous is not expected to have completed yet. */
configASSERT( ( uxReturned & ebALL_SYNC_BITS ) != ebALL_SYNC_BITS );
uxReturned = xEventGroupSync( xEventGroup, /* The event group used for the synchronisation. */ uxReturned = xEventGroupSync( xEventGroup, /* The event group used for the synchronisation. */
uxSynchronisationBit, /* The bit to set in the event group to indicate this task is at the sync point. */ uxSynchronisationBit, /* The bit to set in the event group to indicate this task is at the sync point. */
ebALL_SYNC_BITS,/* The bits to wait for - these bits are set by the other tasks taking part in the sync. */ ebALL_SYNC_BITS,/* The bits to wait for - these bits are set by the other tasks taking part in the sync. */