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

Do not call exit() on MSVC Port when calling vPortEndScheduler (#624)

Browse source 
* make port exitable

* correctly set xPortRunning to False

* add suggestions from Review

Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>

* add suggestions from Review

Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>

---------

Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>
This commit is contained in:
Ju1He1 2023-02-15 07:10:32 +01:00 committed by GitHub
parent 050cf0d80f
commit 8252edec45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
portable/MSVC-MingW/port.c
View file

@ -160,7 +160,7 @@ TIMECAPS xTimeCaps;
/* Just to prevent compiler warnings. */ /* Just to prevent compiler warnings. */
( void ) lpParameter; ( void ) lpParameter;
for( ;; ) while( xPortRunning == pdTRUE )
{ {
/* Wait until the timer expires and we can access the simulated interrupt /* Wait until the timer expires and we can access the simulated interrupt
variables. *NOTE* this is not a 'real time' way of generating tick variables. *NOTE* this is not a 'real time' way of generating tick
@ -177,32 +177,32 @@ TIMECAPS xTimeCaps;
Sleep( portTICK_PERIOD_MS ); Sleep( portTICK_PERIOD_MS );
} }
configASSERT( xPortRunning ); if( xPortRunning == pdTRUE )
{
configASSERT( xPortRunning );
/* Can't proceed if in a critical section as pvInterruptEventMutex won't /* Can't proceed if in a critical section as pvInterruptEventMutex won't
be available. */ be available. */
WaitForSingleObject( pvInterruptEventMutex, INFINITE ); WaitForSingleObject( pvInterruptEventMutex, INFINITE );
/* The timer has expired, generate the simulated tick event. */ /* The timer has expired, generate the simulated tick event. */
ulPendingInterrupts |= ( 1 << portINTERRUPT_TICK ); ulPendingInterrupts |= ( 1 << portINTERRUPT_TICK );
/* The interrupt is now pending - notify the simulated interrupt /* The interrupt is now pending - notify the simulated interrupt
handler thread. Must be outside of a critical section to get here so handler thread. Must be outside of a critical section to get here so
the handler thread can execute immediately pvInterruptEventMutex is the handler thread can execute immediately pvInterruptEventMutex is
released. */ released. */
configASSERT( ulCriticalNesting == 0UL ); configASSERT( ulCriticalNesting == 0UL );
SetEvent( pvInterruptEvent ); SetEvent( pvInterruptEvent );
/* Give back the mutex so the simulated interrupt handler unblocks /* Give back the mutex so the simulated interrupt handler unblocks
and can access the interrupt handler variables. */ and can access the interrupt handler variables. */
ReleaseMutex( pvInterruptEventMutex ); ReleaseMutex( pvInterruptEventMutex );
}
} }
#ifdef __GNUC__
/* Should never reach here - MingW complains if you leave this line out, return 0;
MSVC complains if you put it in. */
return 0;
#endif
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -566,7 +566,7 @@ uint32_t ulErrorCode;
void vPortEndScheduler( void ) void vPortEndScheduler( void )
{ {
exit( 0 ); xPortRunning = pdFALSE;
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/