RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

config: Improve EDF SMP scheduler configuration

Browse Source 
Use CONFIGURE_MAXIMUM_PROCESSORS to configure the EDF SMP scheduler
context.  This avoids hard to debug configuration errors resulting in
memory corruptions.

Close #3815.
This commit is contained in:
Sebastian Huber
2019-12-19 11:38:45 +01:00
parent c737748bb1
commit 806fe963a2
7 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cpukit/include/rtems/confdefs.h
View File

@@ -916,8 +916,7 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
#if !defined(CONFIGURE_SCHEDULER_TABLE_ENTRIES)
/** Configure the context needed by the scheduler instance */
#define CONFIGURE_SCHEDULER \
RTEMS_SCHEDULER_EDF_SMP(dflt, _CONFIGURE_MAXIMUM_PROCESSORS)
#define CONFIGURE_SCHEDULER RTEMS_SCHEDULER_EDF_SMP(dflt)
/** Configure the controls for this scheduler instance */
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \

10
cpukit/include/rtems/scheduler.h
View File

@@ -112,13 +112,17 @@
#ifdef CONFIGURE_SCHEDULER_EDF_SMP
#include <rtems/score/scheduleredfsmp.h>
#ifndef CONFIGURE_MAXIMUM_PROCESSORS
#error "CONFIGURE_MAXIMUM_PROCESSORS must be defined to configure the EDF SMP scheduler"
#endif
#define SCHEDULER_EDF_SMP_CONTEXT_NAME( name ) \
SCHEDULER_CONTEXT_NAME( EDF_SMP_ ## name )
#define RTEMS_SCHEDULER_EDF_SMP( name, max_cpu_count ) \
#define RTEMS_SCHEDULER_EDF_SMP( name ) \
static struct { \
Scheduler_EDF_SMP_Context Base; \
Scheduler_EDF_SMP_Ready_queue Ready[ ( max_cpu_count ) + 1 ]; \
Scheduler_EDF_SMP_Ready_queue Ready[ CONFIGURE_MAXIMUM_PROCESSORS + 1 ]; \
} SCHEDULER_EDF_SMP_CONTEXT_NAME( name )
#define RTEMS_SCHEDULER_TABLE_EDF_SMP( name, obj_name ) \
@@ -132,7 +136,7 @@
/* Provided for backward compatibility */
#define RTEMS_SCHEDULER_CONTEXT_EDF_SMP( name, max_cpu_count ) \
RTEMS_SCHEDULER_EDF_SMP( name, max_cpu_count )
RTEMS_SCHEDULER_EDF_SMP( name )
#define RTEMS_SCHEDULER_CONTROL_EDF_SMP( name, obj_name ) \
RTEMS_SCHEDULER_TABLE_EDF_SMP( name, obj_name )

2
testsuites/smptests/smpschededf01/init.c
View File

@@ -137,7 +137,7 @@ static void Init(rtems_task_argument arg)
#include <rtems/scheduler.h>
RTEMS_SCHEDULER_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS);
RTEMS_SCHEDULER_EDF_SMP(a);
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
RTEMS_SCHEDULER_TABLE_EDF_SMP(a, rtems_build_name('E', 'D', 'F', ' '))

4
testsuites/smptests/smpschededf04/init.c
View File

@@ -112,9 +112,9 @@ static void Init(rtems_task_argument arg)
#include <rtems/scheduler.h>
RTEMS_SCHEDULER_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS);
RTEMS_SCHEDULER_EDF_SMP(a);
RTEMS_SCHEDULER_EDF_SMP(b, CONFIGURE_MAXIMUM_PROCESSORS);
RTEMS_SCHEDULER_EDF_SMP(b);
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
RTEMS_SCHEDULER_TABLE_EDF_SMP(a, MAIN), \

2
testsuites/smptests/smpscheduler02/init.c
View File

@@ -439,7 +439,7 @@ static void Init(rtems_task_argument arg)
RTEMS_SCHEDULER_PRIORITY_SMP(a, 256);
RTEMS_SCHEDULER_EDF_SMP(b, CONFIGURE_MAXIMUM_PROCESSORS);
RTEMS_SCHEDULER_EDF_SMP(b);
RTEMS_SCHEDULER_SIMPLE_SMP(c);

2
testsuites/smptests/smpscheduler07/init.c
View File

@@ -32,7 +32,7 @@ const char rtems_test_name[] = "SMPSCHEDULER 7";
#include <rtems/scheduler.h>
RTEMS_SCHEDULER_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS);
RTEMS_SCHEDULER_EDF_SMP(a);
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
RTEMS_SCHEDULER_TABLE_EDF_SMP( a, rtems_build_name('T', 'E', 'S', 'T'))

4
testsuites/smptests/smpthreadpin01/init.c
View File

@@ -597,9 +597,9 @@ static void Init(rtems_task_argument arg)
#include <rtems/scheduler.h>
RTEMS_SCHEDULER_EDF_SMP(a, CONFIGURE_MAXIMUM_PROCESSORS);
RTEMS_SCHEDULER_EDF_SMP(a);
RTEMS_SCHEDULER_EDF_SMP(b, CONFIGURE_MAXIMUM_PROCESSORS);
RTEMS_SCHEDULER_EDF_SMP(b);
#define CONFIGURE_SCHEDULER_TABLE_ENTRIES \
RTEMS_SCHEDULER_TABLE_EDF_SMP(a, SCHED_A), \