Update soak test for SMP

* Use configNUMBER_OF_CORES to separate the changes
chinglee-iot · Feb 9, 2023 · 1bf0f01 · 1bf0f01
1 parent 8f863ae
commit 1bf0f01
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/FreeRTOS/Demo/Common/Minimal/BlockQ.c b/FreeRTOS/Demo/Common/Minimal/BlockQ.c
@@ -61,6 +61,7 @@
 #define blckqSTACK_SIZE       configMINIMAL_STACK_SIZE
 #define blckqNUM_TASK_SETS    ( 3 )
 
+#define blckqSHORT_DELAY	( 5 )
 #if ( configSUPPORT_DYNAMIC_ALLOCATION == 0 )
     #error This example cannot be used if dynamic allocation is not allowed.
 #endif
@@ -200,8 +201,17 @@ static portTASK_FUNCTION( vBlockingQueueProducer, pvParameters )
              * consumer will expect the numbers to	follow in numerical order. */
             ++usValue;
 
-            #if configUSE_PREEMPTION == 0
+            #if ( configNUMBER_OF_CORES > 1 )
+            {
+                if( pxQueueParameters->xBlockTime == 0 )
+                {
+                    vTaskDelay( blckqSHORT_DELAY );
+                }
+            }
+            #elif configUSE_PREEMPTION == 0
+            {
                 taskYIELD();
+            }
             #endif
         }
     }
@@ -241,7 +251,14 @@ static portTASK_FUNCTION( vBlockingQueueConsumer, pvParameters )
                 ++usExpectedValue;
             }
 
-            #if configUSE_PREEMPTION == 0
+            #if ( configNUMBER_OF_CORES > 1 )
+            {
+                if( pxQueueParameters->xBlockTime == 0 )
+                {
+                    vTaskDelay( blckqSHORT_DELAY );
+                }
+            }
+            #elif configUSE_PREEMPTION == 0
             {
                 if( pxQueueParameters->xBlockTime == 0 )
                 {

diff --git a/FreeRTOS/Demo/Common/Minimal/IntQueue.c b/FreeRTOS/Demo/Common/Minimal/IntQueue.c
@@ -97,15 +97,15 @@
     if( xQueueIsQueueFullFromISR( xNormallyEmptyQueue ) != pdTRUE )                                                                       \
     {                                                                                                                                     \
         UBaseType_t uxSavedInterruptStatus;                                                                                               \
-        uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();                                                                       \
+        uxSavedInterruptStatus = taskENTER_CRITICAL_FROM_ISR();                                                                           \
         {                                                                                                                                 \
             uxValueForNormallyEmptyQueue++;                                                                                               \
             if( xQueueSendFromISR( xNormallyEmptyQueue, ( void * ) &uxValueForNormallyEmptyQueue, &xHigherPriorityTaskWoken ) != pdPASS ) \
             {                                                                                                                             \
                 uxValueForNormallyEmptyQueue--;                                                                                           \
             }                                                                                                                             \
         }                                                                                                                                 \
-        portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );                                                                      \
+        taskEXIT_CRITICAL_FROM_ISR( uxSavedInterruptStatus );                                                                             \
     }                                                                                                                                     \
 
 
@@ -115,15 +115,15 @@
     if( xQueueIsQueueFullFromISR( xNormallyFullQueue ) != pdTRUE )                                                                      \
     {                                                                                                                                   \
         UBaseType_t uxSavedInterruptStatus;                                                                                             \
-        uxSavedInterruptStatus = portSET_INTERRUPT_MASK_FROM_ISR();                                                                     \
+        uxSavedInterruptStatus = taskENTER_CRITICAL_FROM_ISR();                                                                         \
         {                                                                                                                               \
             uxValueForNormallyFullQueue++;                                                                                              \
             if( xQueueSendFromISR( xNormallyFullQueue, ( void * ) &uxValueForNormallyFullQueue, &xHigherPriorityTaskWoken ) != pdPASS ) \
             {                                                                                                                           \
                 uxValueForNormallyFullQueue--;                                                                                          \
             }                                                                                                                           \
         }                                                                                                                               \
-        portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedInterruptStatus );                                                                    \
+        taskEXIT_CRITICAL_FROM_ISR( uxSavedInterruptStatus );                                                                           \
     }                                                                                                                                   \
 
 

diff --git a/FreeRTOS/Demo/Common/Minimal/dynamic.c b/FreeRTOS/Demo/Common/Minimal/dynamic.c
@@ -279,7 +279,16 @@ static portTASK_FUNCTION( vCounterControlTask, pvParameters )
 
             #if ( INCLUDE_eTaskGetState == 1 )
             {
-                configASSERT( eTaskGetState( xContinuousIncrementHandle ) == eReady );
+                #if( configNUMBER_OF_CORES > 1 )
+                {
+                    eTaskState eState = eTaskGetState( xContinuousIncrementHandle );
+                    configASSERT( ( eState == eReady ) || ( eState == eRunning ) );
+                }
+                #else
+                {
+                    configASSERT( eTaskGetState( xContinuousIncrementHandle ) == eReady );
+                }
+                #endif
             }
             #endif /* INCLUDE_eTaskGetState */