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

config: Remove CONFIGURE_DISABLE_SMP_CONFIGURATION

Browse Source 
The CONFIGURE_DISABLE_SMP_CONFIGURATION configuration option and
rtems_configuration_is_smp_enabled() were added during the SMP support
development cycle as a workaround to fix some testsuite failures in SMP
configurations.  All use cases were replaced with tests for specific
conditions.  The configuration option and test macro were undocumented.

Close #3876.
This commit is contained in:
Sebastian Huber
2020-02-15 12:07:28 +01:00
parent ca82a6038e
commit c7f748a100
39 changed files with 0 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,18 +161,6 @@ extern "C" {
#define _CONFIGURE_MAXIMUM_PROCESSORS 1 #define _CONFIGURE_MAXIMUM_PROCESSORS 1
#endif #endif
/*
* An internal define to indicate that this is an SMP application
* configuration.
*/
#ifdef RTEMS_SMP
#if !defined(CONFIGURE_DISABLE_SMP_CONFIGURATION)
#define _CONFIGURE_SMP_APPLICATION
#elif _CONFIGURE_MAXIMUM_PROCESSORS > 1
#error "CONFIGURE_DISABLE_SMP_CONFIGURATION and CONFIGURE_MAXIMUM_PROCESSORS > 1 makes no sense"
#endif
#endif
#ifdef CONFIGURE_SMP_APPLICATION #ifdef CONFIGURE_SMP_APPLICATION
#warning "CONFIGURE_SMP_APPLICATION is obsolete since RTEMS 5.1" #warning "CONFIGURE_SMP_APPLICATION is obsolete since RTEMS 5.1"
#endif #endif
@@ -2621,13 +2609,6 @@ struct _reent *__getreent(void)
#endif #endif
#ifdef RTEMS_SMP #ifdef RTEMS_SMP
const bool _SMP_Is_enabled =
#ifdef _CONFIGURE_SMP_APPLICATION
true;
#else
false;
#endif
const uint32_t _SMP_Processor_configured_maximum = const uint32_t _SMP_Processor_configured_maximum =
_CONFIGURE_MAXIMUM_PROCESSORS; _CONFIGURE_MAXIMUM_PROCESSORS;
#endif #endif

13
cpukit/include/rtems/config.h
View File

@@ -150,19 +150,6 @@ uint32_t rtems_configuration_get_maximum_extensions( void );
NULL NULL
#endif #endif
/**
* @brief Returns true if the SMP mode of operation is enabled, and false
* otherwise.
*
* In uni-processor configurations this is a compile-time constant which
* evaluates to false.
*
* @retval true SMP mode of operation is enabled.
* @retval false Otherwise.
*/
#define rtems_configuration_is_smp_enabled() \
(_SMP_Is_enabled)
/** /**
* @brief Returns the configured maximum count of processors. * @brief Returns the configured maximum count of processors.
* *

13
cpukit/include/rtems/score/smp.h
View File

@@ -36,19 +36,6 @@ extern "C" {
* @{ * @{
*/ */
/**
* @brief Indicates if SMP is enabled.
*
* In SMP configurations, this constant is defined by the application
* configuration via <rtems/confdefs.h>, otherwise it is a compile-time
* constant with the value false.
*/
#if defined(RTEMS_SMP)
extern const bool _SMP_Is_enabled;
#else
#define _SMP_Is_enabled false
#endif
/** /**
* @brief The configured processor maximum. * @brief The configured processor maximum.
* *

2
testsuites/ada/support/initimpl.h
View File

@@ -49,8 +49,6 @@ void check_type(long type, long size, long alignment);
#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION #define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
const char rtems_test_name[] = ADA_TEST_NAME; const char rtems_test_name[] = ADA_TEST_NAME;

2
testsuites/libtests/block08/system.h
View File

@@ -49,8 +49,6 @@ rtems_task Init(
#define CONFIGURE_EXTRA_TASK_STACKS (13 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (13 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */

2
testsuites/libtests/cpuuse/system.h
View File

@@ -50,8 +50,6 @@ void Task_switch(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

1
testsuites/libtests/rtmonuse/system.h
View File

@@ -48,7 +48,6 @@ void Get_all_counters( void );
#define CONFIGURE_EXTRA_TASK_STACKS (20 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (20 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/libtests/termios05/init.c
View File

@@ -161,8 +161,6 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include <rtems/confdefs.h> #include <rtems/confdefs.h>

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

@@ -27,8 +27,6 @@ static void test(void)
rtems_mode mode; rtems_mode mode;
rtems_id id; rtems_id id;
rtems_test_assert(rtems_configuration_is_smp_enabled());
sc = rtems_task_mode(RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &mode); sc = rtems_task_mode(RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &mode);
rtems_test_assert(sc == RTEMS_NOT_IMPLEMENTED); rtems_test_assert(sc == RTEMS_NOT_IMPLEMENTED);

2
testsuites/sptests/sp01/system.h
View File

@@ -31,8 +31,6 @@ rtems_task Task_1_through_3(
#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_TASKS 4
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/sp04/system.h
View File

@@ -52,8 +52,6 @@ void Task_switch(
#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_TASKS 4
#define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_TIMERS 1
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/sp07/system.h
View File

@@ -74,8 +74,6 @@ void Task_exit_extension(
#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_MAXIMUM_TASKS 5 #define CONFIGURE_MAXIMUM_TASKS 5
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/sp08/init.c
View File

@@ -316,8 +316,6 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of file */ /* end of file */

2
testsuites/sptests/sp12/system.h
View File

@@ -65,8 +65,6 @@ rtems_task Task5(
#define CONFIGURE_EXTRA_TASK_STACKS (6 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (6 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/sp13/system.h
View File

@@ -97,8 +97,6 @@ TEST_EXTERN rtems_name Queue_name[ 4 ]; /* array of queue names */
#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */

2
testsuites/sptests/sp14/system.h
View File

@@ -51,8 +51,6 @@ rtems_task Task_2(
#define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/sp16/system.h
View File

@@ -54,8 +54,6 @@ rtems_task Task5(
#define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (1 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/sp20/system.h
View File

@@ -49,8 +49,6 @@ void Get_all_counters( void );
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/sp37/system.h
View File

@@ -39,8 +39,6 @@ rtems_task Init(
#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TASKS 2
#define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_TIMERS 1
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */

2
testsuites/sptests/sp65/sp65impl.h
View File

@@ -145,8 +145,6 @@ rtems_task Task_1(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include <rtems/confdefs.h> #include <rtems/confdefs.h>

2
testsuites/sptests/spcbssched01/system.h
View File

@@ -37,8 +37,6 @@ rtems_task Task_1_through_3(
#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_TASKS 4
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/spcbssched02/system.h
View File

@@ -43,8 +43,6 @@ rtems_task Task_Periodic(
#define CONFIGURE_SCHEDULER_CBS #define CONFIGURE_SCHEDULER_CBS
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
#include <rtems/rtems/clock.h> #include <rtems/rtems/clock.h>

2
testsuites/sptests/spcbssched03/system.h
View File

@@ -47,8 +47,6 @@ rtems_task Tasks_Aperiodic(
#define CONFIGURE_SCHEDULER_CBS #define CONFIGURE_SCHEDULER_CBS
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
#include <rtems/rtems/clock.h> #include <rtems/rtems/clock.h>

2
testsuites/sptests/spedfsched01/system.h
View File

@@ -37,8 +37,6 @@ rtems_task Task_1_through_3(
#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)
#define CONFIGURE_MAXIMUM_TASKS 4 #define CONFIGURE_MAXIMUM_TASKS 4
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/spedfsched02/system.h
View File

@@ -49,8 +49,6 @@ void Get_all_counters( void );
#define CONFIGURE_SCHEDULER_EDF #define CONFIGURE_SCHEDULER_EDF
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* global variables */ /* global variables */

2
testsuites/sptests/spedfsched03/system.h
View File

@@ -47,8 +47,6 @@ rtems_task Tasks_Aperiodic(
#define CONFIGURE_SCHEDULER_EDF #define CONFIGURE_SCHEDULER_EDF
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
#include <rtems/rtems/clock.h> #include <rtems/rtems/clock.h>

2
testsuites/sptests/spfatal29/init.c
View File

@@ -25,8 +25,6 @@
#define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_TIMERS 1
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
static void timer(rtems_id id, void *arg) static void timer(rtems_id id, void *arg)
{ {
rtems_task_wake_after(RTEMS_YIELD_PROCESSOR); rtems_task_wake_after(RTEMS_YIELD_PROCESSOR);

2
testsuites/sptests/spfifo03/init.c
View File

@@ -217,8 +217,6 @@ rtems_task Init(
#define CONFIGURE_IMFS_ENABLE_MKFIFO #define CONFIGURE_IMFS_ENABLE_MKFIFO
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include <rtems/confdefs.h> #include <rtems/confdefs.h>

2
testsuites/sptests/spfifo05/init.c
View File

@@ -273,8 +273,6 @@ rtems_task Init(
#define CONFIGURE_IMFS_ENABLE_MKFIFO #define CONFIGURE_IMFS_ENABLE_MKFIFO
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include <rtems/confdefs.h> #include <rtems/confdefs.h>

2
testsuites/sptests/spintrcritical06/spintrcritical06impl.h
View File

@@ -139,8 +139,6 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include <rtems/confdefs.h> #include <rtems/confdefs.h>

2
testsuites/sptests/spintrcritical15/init.c
View File

@@ -111,8 +111,6 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include <rtems/confdefs.h> #include <rtems/confdefs.h>

2
testsuites/sptests/spmrsp01/init.c
View File

@@ -334,8 +334,6 @@ static void Init(rtems_task_argument arg)
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include <rtems/confdefs.h> #include <rtems/confdefs.h>

2
testsuites/sptests/spsimplesched02/init.c
View File

@@ -158,8 +158,6 @@ rtems_task Init(
#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT #define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_NO_PREEMPT
#define CONFIGURE_INIT_TASK_PRIORITY 4 #define CONFIGURE_INIT_TASK_PRIORITY 4
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#define CONFIGURE_INIT #define CONFIGURE_INIT
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */

2
testsuites/tmtests/tm04/system.h
View File

@@ -32,8 +32,6 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */

2
testsuites/tmtests/tm08/system.h
View File

@@ -31,8 +31,6 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */

2
testsuites/tmtests/tm15/system.h
View File

@@ -33,8 +33,6 @@ rtems_id Task_id[ OPERATION_COUNT+1 ]; /* array of task ids */
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */

2
testsuites/tmtests/tm20/system.h
View File

@@ -36,8 +36,6 @@ rtems_id Task_id[ OPERATION_COUNT+1 ]; /* array of task ids */
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */

2
testsuites/tmtests/tm22/system.h
View File

@@ -37,8 +37,6 @@ rtems_task Init(
CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE(100, MESSAGE_SIZE ) CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE(100, MESSAGE_SIZE )
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */

2
testsuites/tmtests/tm24/system.h
View File

@@ -31,8 +31,6 @@ rtems_task Init(
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_DISABLE_SMP_CONFIGURATION
#include <rtems/confdefs.h> #include <rtems/confdefs.h>
/* end of include file */ /* end of include file */