len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-05-03 11:50:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Return the lock counts to their original intended behaviour.

Browse source
This commit is contained in:
Richard Barry 2008-03-29 20:50:38 +00:00
parent 9596b04eff
commit 3fd422ff2f
1 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Source/queue.c
View file

@ -58,7 +58,9 @@
*----------------------------------------------------------*/ *----------------------------------------------------------*/
/* Constants used with the cRxLock and cTxLock structure members. */ /* Constants used with the cRxLock and cTxLock structure members. */
#define queueUNLOCKED ( ( signed portBASE_TYPE ) -1 ) #define queueUNLOCKED ( ( signed portBASE_TYPE ) -1 )
#define queueLOCKED_UNMODIFIED ( ( signed portBASE_TYPE ) 0 )
#define queueERRONEOUS_UNBLOCK ( -1 ) #define queueERRONEOUS_UNBLOCK ( -1 )
/* For internal use only. */ /* For internal use only. */
@ -177,12 +179,20 @@ static void prvCopyDataFromQueue( xQUEUE * const pxQueue, const void *pvBuffer )
* Macro to mark a queue as locked. Locking a queue prevents an ISR from * Macro to mark a queue as locked. Locking a queue prevents an ISR from
* accessing the queue event lists. * accessing the queue event lists.
*/ */
#define prvLockQueue( pxQueue ) \ #define prvLockQueue( pxQueue ) \
{ \ { \
taskENTER_CRITICAL(); \ taskENTER_CRITICAL(); \
++( pxQueue->xRxLock ); \ { \
++( pxQueue->xTxLock ); \ if( pxQueue->xRxLock == queueUNLOCKED ) \
taskEXIT_CRITICAL(); \ { \
pxQueue->xRxLock = queueLOCKED_UNMODIFIED; \
} \
if( pxQueue->xTxLock == queueUNLOCKED ) \
{ \
pxQueue->xTxLock = queueLOCKED_UNMODIFIED; \
} \
} \
taskEXIT_CRITICAL(); \
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -1134,13 +1144,9 @@ static void prvUnlockQueue( xQueueHandle pxQueue )
updated. */ updated. */
taskENTER_CRITICAL(); taskENTER_CRITICAL();
{ {
--( pxQueue->xTxLock );
/* See if data was added to the queue while it was locked. */ /* See if data was added to the queue while it was locked. */
if( pxQueue->xTxLock > queueUNLOCKED ) while( pxQueue->xTxLock > queueLOCKED_UNMODIFIED )
{ {
pxQueue->xTxLock = queueUNLOCKED;
/* Data was posted while the queue was locked. Are any tasks /* Data was posted while the queue was locked. Are any tasks
blocked waiting for data to become available? */ blocked waiting for data to become available? */
if( !listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToReceive ) ) ) if( !listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToReceive ) ) )
@ -1153,28 +1159,40 @@ static void prvUnlockQueue( xQueueHandle pxQueue )
context switch is required. */ context switch is required. */
vTaskMissedYield(); vTaskMissedYield();
} }
}
--( pxQueue->xTxLock );
}
else
{
break;
}
} }
pxQueue->xTxLock = queueUNLOCKED;
} }
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
/* Do the same for the Rx lock. */ /* Do the same for the Rx lock. */
taskENTER_CRITICAL(); taskENTER_CRITICAL();
{ {
--( pxQueue->xRxLock ); while( pxQueue->xRxLock > queueLOCKED_UNMODIFIED )
if( pxQueue->xRxLock > queueUNLOCKED )
{ {
pxQueue->xRxLock = queueUNLOCKED;
if( !listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToSend ) ) ) if( !listLIST_IS_EMPTY( &( pxQueue->xTasksWaitingToSend ) ) )
{ {
if( xTaskRemoveFromEventList( &( pxQueue->xTasksWaitingToSend ) ) != pdFALSE ) if( xTaskRemoveFromEventList( &( pxQueue->xTasksWaitingToSend ) ) != pdFALSE )
{ {
vTaskMissedYield(); vTaskMissedYield();
} }
}
--( pxQueue->xRxLock );
}
else
{
break;
}
} }
pxQueue->xRxLock = queueUNLOCKED;
} }
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
} }