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

Increase the priority of the Windows threads used by the FreeRTOS Windows port, and, because the threads have high priority and run on the same core, prevent the port running on single core hosts so as to avoid locking up the host.

Browse source
This commit is contained in:
Richard Barry 2017-01-04 04:48:22 +00:00
parent f98b675671
commit ca9edf3531
2 changed files with 49 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
FreeRTOS/Source/portable/MSVC-MingW/port.c
View file

@ -83,21 +83,12 @@
#define portMAX_INTERRUPTS ( ( uint32_t ) sizeof( uint32_t ) * 8UL ) /* The number of bits in an uint32_t. */ #define portMAX_INTERRUPTS ( ( uint32_t ) sizeof( uint32_t ) * 8UL ) /* The number of bits in an uint32_t. */
#define portNO_CRITICAL_NESTING ( ( uint32_t ) 0 ) #define portNO_CRITICAL_NESTING ( ( uint32_t ) 0 )
/* The priorities at which the various components of the simulation execute. /* The priorities at which the various components of the simulation execute. */
Priorities are higher when a soak test is performed to lessen the effect of #define portDELETE_SELF_THREAD_PRIORITY THREAD_PRIORITY_TIME_CRITICAL /* Must be highest. */
Windows interfering with the timing. */ #define portSIMULATED_INTERRUPTS_THREAD_PRIORITY THREAD_PRIORITY_TIME_CRITICAL
#define portSOAK_TEST #define portSIMULATED_TIMER_THREAD_PRIORITY THREAD_PRIORITY_HIGHEST
#ifndef portSOAK_TEST #define portTASK_THREAD_PRIORITY THREAD_PRIORITY_ABOVE_NORMAL
#define portDELETE_SELF_THREAD_PRIORITY THREAD_PRIORITY_HIGHEST /* Must be highest. */
#define portSIMULATED_INTERRUPTS_THREAD_PRIORITY THREAD_PRIORITY_NORMAL
#define portSIMULATED_TIMER_THREAD_PRIORITY THREAD_PRIORITY_BELOW_NORMAL
#define portTASK_THREAD_PRIORITY THREAD_PRIORITY_IDLE
#else
#define portDELETE_SELF_THREAD_PRIORITY THREAD_PRIORITY_TIME_CRITICAL /* Must be highest. */
#define portSIMULATED_INTERRUPTS_THREAD_PRIORITY THREAD_PRIORITY_HIGHEST
#define portSIMULATED_TIMER_THREAD_PRIORITY THREAD_PRIORITY_ABOVE_NORMAL
#define portTASK_THREAD_PRIORITY THREAD_PRIORITY_NORMAL
#endif
/* /*
* Created as a high priority thread, this function uses a timer to simulate * Created as a high priority thread, this function uses a timer to simulate
* a tick interrupt being generated on an embedded target. In this Windows * a tick interrupt being generated on an embedded target. In this Windows
@ -264,16 +255,6 @@ xThreadState *pxThreadState = NULL;
int8_t *pcTopOfStack = ( int8_t * ) pxTopOfStack; int8_t *pcTopOfStack = ( int8_t * ) pxTopOfStack;
const SIZE_T xStackSize = 1024; /* Set the size to a small number which will get rounded up to the minimum possible. */ const SIZE_T xStackSize = 1024; /* Set the size to a small number which will get rounded up to the minimum possible. */
#ifdef portSOAK_TEST
{
/* Ensure highest priority class is inherited. */
if( !SetPriorityClass( GetCurrentProcess(), REALTIME_PRIORITY_CLASS ) )
{
printf( "SetPriorityClass() failed\r\n" );
}
}
#endif
/* In this simulated case a stack is not initialised, but instead a thread /* In this simulated case a stack is not initialised, but instead a thread
is created that will execute the task being created. The thread handles is created that will execute the task being created. The thread handles
the context switching itself. The xThreadState object is placed onto the context switching itself. The xThreadState object is placed onto
@ -295,31 +276,53 @@ const SIZE_T xStackSize = 1024; /* Set the size to a small number which will get
BaseType_t xPortStartScheduler( void ) BaseType_t xPortStartScheduler( void )
{ {
void *pvHandle; void *pvHandle = NULL;
int32_t lSuccess = pdPASS; int32_t lSuccess;
xThreadState *pxThreadState; xThreadState *pxThreadState = NULL;
SYSTEM_INFO xSystemInfo;
/* Install the interrupt handlers used by the scheduler itself. */ /* This port runs windows threads with extremely high priority. All the
vPortSetInterruptHandler( portINTERRUPT_YIELD, prvProcessYieldInterrupt ); threads execute on the same core - to prevent locking up the host only start
vPortSetInterruptHandler( portINTERRUPT_TICK, prvProcessTickInterrupt ); if the host has multiple cores. */
GetSystemInfo( &xSystemInfo );
/* Create the events and mutexes that are used to synchronise all the if( xSystemInfo.dwNumberOfProcessors <= 1 )
threads. */
pvInterruptEventMutex = CreateMutex( NULL, FALSE, NULL );
pvInterruptEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
if( ( pvInterruptEventMutex == NULL ) || ( pvInterruptEvent == NULL ) )
{ {
printf( "This version of the FreeRTOS Windows port can only be used on multi-core hosts.\r\n" );
lSuccess = pdFAIL; lSuccess = pdFAIL;
} }
else
/* Set the priority of this thread such that it is above the priority of
the threads that run tasks. This higher priority is required to ensure
simulated interrupts take priority over tasks. */
pvHandle = GetCurrentThread();
if( pvHandle == NULL )
{ {
lSuccess = pdFAIL; lSuccess = pdPASS;
/* The highest priority class is used to [try to] prevent other Windows
activity interfering with FreeRTOS timing too much. */
if( SetPriorityClass( GetCurrentProcess(), REALTIME_PRIORITY_CLASS ) == 0 )
{
printf( "SetPriorityClass() failed\r\n" );
}
/* Install the interrupt handlers used by the scheduler itself. */
vPortSetInterruptHandler( portINTERRUPT_YIELD, prvProcessYieldInterrupt );
vPortSetInterruptHandler( portINTERRUPT_TICK, prvProcessTickInterrupt );
/* Create the events and mutexes that are used to synchronise all the
threads. */
pvInterruptEventMutex = CreateMutex( NULL, FALSE, NULL );
pvInterruptEvent = CreateEvent( NULL, FALSE, FALSE, NULL );
if( ( pvInterruptEventMutex == NULL ) || ( pvInterruptEvent == NULL ) )
{
lSuccess = pdFAIL;
}
/* Set the priority of this thread such that it is above the priority of
the threads that run tasks. This higher priority is required to ensure
simulated interrupts take priority over tasks. */
pvHandle = GetCurrentThread();
if( pvHandle == NULL )
{
lSuccess = pdFAIL;
}
} }
if( lSuccess == pdPASS ) if( lSuccess == pdPASS )

1
FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
View file

@ -71,6 +71,7 @@
#define PORTMACRO_H #define PORTMACRO_H
#include <Windows.h> #include <Windows.h>
#include <WinBase.h>
/****************************************************************************** /******************************************************************************
Defines Defines