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

Changed vPortCheckCorrectThreadIsRunning() in the Win32 port layer to use the Win32 thread ID rather than its handle.

Browse source
This commit is contained in:
Richard Barry 2010-11-21 14:06:23 +00:00
parent 60bea08b22
commit 37b6fb5773
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Source/portable/MSVC-MingW/port.c
View file

@ -89,6 +89,11 @@ typedef struct
/* Handle of the thread that executes the task. */ /* Handle of the thread that executes the task. */
void *pvThread; void *pvThread;
/* Used to check that the thread that is supposed to be running in indeed
the thread that is running. */
unsigned long ulThreadId;
} xThreadState; } xThreadState;
/* Pseudo interrupts waiting to be processed. This is a bit mask where each /* Pseudo interrupts waiting to be processed. This is a bit mask where each
@ -181,7 +186,7 @@ xThreadState *pxThreadState = NULL;
pxThreadState = ( xThreadState * ) ( pxTopOfStack - sizeof( xThreadState ) ); pxThreadState = ( xThreadState * ) ( pxTopOfStack - sizeof( xThreadState ) );
/* Create the thread itself. */ /* Create the thread itself. */
pxThreadState->pvThread = ( void * ) CreateThread( NULL, 0, ( LPTHREAD_START_ROUTINE ) pxCode, pvParameters, CREATE_SUSPENDED, NULL ); pxThreadState->pvThread = CreateThread( NULL, 0, ( LPTHREAD_START_ROUTINE ) pxCode, pvParameters, CREATE_SUSPENDED, &( pxThreadState->ulThreadId ) );
SetThreadPriorityBoost( pxThreadState->pvThread, TRUE ); SetThreadPriorityBoost( pxThreadState->pvThread, TRUE );
pxThreadState->lWaitingInterruptAck = pdFALSE; pxThreadState->lWaitingInterruptAck = pdFALSE;
SetThreadPriority( pxThreadState->pvThread, THREAD_PRIORITY_IDLE ); SetThreadPriority( pxThreadState->pvThread, THREAD_PRIORITY_IDLE );
@ -536,15 +541,20 @@ long lMutexNeedsReleasing;
void vPortCheckCorrectThreadIsRunning( void ) void vPortCheckCorrectThreadIsRunning( void )
{ {
xThreadState *pxThreadState = ( xThreadState * ) *( ( unsigned long * ) pxCurrentTCB ); xThreadState *pxThreadState;
/* When switching threads, Windows does not always seem to run the selected /* When switching threads, Windows does not always seem to run the selected
thread immediately. This function can be called to check if the thread thread immediately. This function can be called to check if the thread
that is currently running is the thread that is responsible for executing that is currently running is the thread that is responsible for executing
the task selected by the real time scheduler. */ the task selected by the real time scheduler. */
if( GetCurrentThread() != pxThreadState->pvThread ) if( xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED )
{
pxThreadState = ( xThreadState * ) *( ( unsigned long * ) pxCurrentTCB );
if( GetCurrentThreadId() != pxThreadState->ulThreadId )
{ {
SwitchToThread(); SwitchToThread();
} }
} }
}