diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-10-31 13:08:33 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-11-10 09:22:09 +0100 |
commit | 05ca53ddf6bc8333c2f3ad861c5415467c3262d2 (patch) | |
tree | 9b011af47a8304527c77ba8992418e473f540ecf /testsuites | |
parent | score: Add and use Thread_Control::is_idle (diff) | |
download | rtems-05ca53ddf6bc8333c2f3ad861c5415467c3262d2.tar.bz2 |
rtems: Add scheduler processor add/remove
Update #2797.
Diffstat (limited to 'testsuites')
-rw-r--r-- | testsuites/smptests/Makefile.am | 1 | ||||
-rw-r--r-- | testsuites/smptests/configure.ac | 1 | ||||
-rw-r--r-- | testsuites/smptests/smpscheduler02/init.c | 130 | ||||
-rw-r--r-- | testsuites/smptests/smpscheduler04/Makefile.am | 19 | ||||
-rw-r--r-- | testsuites/smptests/smpscheduler04/init.c | 298 | ||||
-rw-r--r-- | testsuites/smptests/smpscheduler04/smpscheduler04.doc | 14 | ||||
-rw-r--r-- | testsuites/smptests/smpscheduler04/smpscheduler04.scn | 4 | ||||
-rw-r--r-- | testsuites/sptests/spscheduler01/init.c | 28 |
8 files changed, 495 insertions, 0 deletions
diff --git a/testsuites/smptests/Makefile.am b/testsuites/smptests/Makefile.am index 63398e3162..86b9fed1db 100644 --- a/testsuites/smptests/Makefile.am +++ b/testsuites/smptests/Makefile.am @@ -37,6 +37,7 @@ SUBDIRS += smpschedaffinity05 SUBDIRS += smpscheduler01 SUBDIRS += smpscheduler02 SUBDIRS += smpscheduler03 +SUBDIRS += smpscheduler04 SUBDIRS += smpschedsem01 SUBDIRS += smpsignal01 SUBDIRS += smpstrongapa01 diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac index 6c632ce406..75fef51fca 100644 --- a/testsuites/smptests/configure.ac +++ b/testsuites/smptests/configure.ac @@ -97,6 +97,7 @@ smpschedaffinity05/Makefile smpscheduler01/Makefile smpscheduler02/Makefile smpscheduler03/Makefile +smpscheduler04/Makefile smpschedsem01/Makefile smpsignal01/Makefile smpswitchextension01/Makefile diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c index 1492d4c881..082bd21cd4 100644 --- a/testsuites/smptests/smpscheduler02/init.c +++ b/testsuites/smptests/smpscheduler02/init.c @@ -37,6 +37,8 @@ static rtems_id cmtx_id; static rtems_id imtx_id; +static volatile bool ready; + static void task(rtems_task_argument arg) { rtems_status_code sc; @@ -67,6 +69,131 @@ static void task(rtems_task_argument arg) } } +static void sticky_task(rtems_task_argument arg) +{ + rtems_status_code sc; + rtems_id mtx_id; + + (void) arg; + + rtems_test_assert(rtems_get_current_processor() == 0); + + sc = rtems_semaphore_create( + rtems_build_name(' ', 'M', 'T', 'X'), + 1, + RTEMS_BINARY_SEMAPHORE | RTEMS_MULTIPROCESSOR_RESOURCE_SHARING, + 2, + &mtx_id + ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_semaphore_obtain(mtx_id, RTEMS_WAIT, RTEMS_NO_TIMEOUT); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + ready = true; + + sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_semaphore_release(mtx_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_semaphore_delete(mtx_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_event_transient_send(main_task_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + while (1) { + /* Do nothing */ + } +} + +static void test_scheduler_add_remove_processors(void) +{ + rtems_status_code sc; + rtems_id scheduler_a_id; + rtems_id scheduler_c_id; + + sc = rtems_scheduler_ident(SCHED_A, &scheduler_a_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_scheduler_ident(SCHED_C, &scheduler_c_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_scheduler_add_processor(scheduler_c_id, 62); + rtems_test_assert(sc == RTEMS_NOT_CONFIGURED); + + sc = rtems_scheduler_add_processor(scheduler_c_id, 63); + rtems_test_assert(sc == RTEMS_INCORRECT_STATE); + + sc = rtems_scheduler_remove_processor(scheduler_c_id, 62); + rtems_test_assert(sc == RTEMS_INVALID_NUMBER); + + sc = rtems_scheduler_remove_processor(scheduler_a_id, 0); + rtems_test_assert(sc == RTEMS_RESOURCE_IN_USE); + + if (rtems_get_processor_count() > 1) { + rtems_id scheduler_b_id; + rtems_id task_id; + + sc = rtems_scheduler_ident(SCHED_B, &scheduler_b_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_scheduler_remove_processor(scheduler_b_id, 1); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_scheduler_add_processor(scheduler_a_id, 1); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + rtems_test_assert(rtems_get_current_processor() == 0); + + sc = rtems_scheduler_remove_processor(scheduler_a_id, 0); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + rtems_test_assert(rtems_get_current_processor() == 1); + + sc = rtems_scheduler_add_processor(scheduler_a_id, 0); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + rtems_test_assert(rtems_get_current_processor() == 1); + + sc = rtems_task_create( + rtems_build_name('T', 'A', 'S', 'K'), + 2, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &task_id + ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_start(task_id, sticky_task, 0); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + while (!ready) { + /* Wait */ + } + + sc = rtems_scheduler_remove_processor(scheduler_a_id, 1); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + rtems_test_assert(rtems_get_current_processor() == 0); + + sc = rtems_event_transient_send(task_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_event_transient_receive(RTEMS_WAIT, RTEMS_NO_TIMEOUT); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_delete(task_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_scheduler_add_processor(scheduler_b_id, 1); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + } +} + static void test(void) { rtems_status_code sc; @@ -248,6 +375,8 @@ static void test(void) sc = rtems_semaphore_delete(imtx_id); rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + test_scheduler_add_remove_processors(); } static void Init(rtems_task_argument arg) @@ -271,6 +400,7 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_SEMAPHORES 2 +#define CONFIGURE_MAXIMUM_MRSP_SEMAPHORES 1 #define CONFIGURE_SMP_APPLICATION diff --git a/testsuites/smptests/smpscheduler04/Makefile.am b/testsuites/smptests/smpscheduler04/Makefile.am new file mode 100644 index 0000000000..bcfea13008 --- /dev/null +++ b/testsuites/smptests/smpscheduler04/Makefile.am @@ -0,0 +1,19 @@ +rtems_tests_PROGRAMS = smpscheduler04 +smpscheduler04_SOURCES = init.c + +dist_rtems_tests_DATA = smpscheduler04.scn smpscheduler04.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(smpscheduler04_OBJECTS) +LINK_LIBS = $(smpscheduler04_LDLIBS) + +smpscheduler04$(EXEEXT): $(smpscheduler04_OBJECTS) $(smpscheduler04_DEPENDENCIES) + @rm -f smpscheduler04$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/smptests/smpscheduler04/init.c b/testsuites/smptests/smpscheduler04/init.c new file mode 100644 index 0000000000..2e5b213cf8 --- /dev/null +++ b/testsuites/smptests/smpscheduler04/init.c @@ -0,0 +1,298 @@ +/* + * Copyright (c) 2016 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * <rtems@embedded-brains.de> + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. + */ + +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif + +#include <inttypes.h> +#include <string.h> +#include <stdio.h> + +#include <rtems.h> +#include <rtems/libcsupport.h> + +#include "tmacros.h" + +const char rtems_test_name[] = "SMPSCHEDULER 4"; + +#define CPU_COUNT 32 + +#define PRIO_MIGRATION 2 + +#define PRIO_SCHEDULER 3 + +typedef struct { + rtems_id migration_task; + rtems_id scheduler_task; + rtems_id scheduler_ids[CPU_COUNT]; + uint32_t migration_counter RTEMS_ALIGNED(CPU_CACHE_LINE_BYTES); + uint32_t scheduler_counter RTEMS_ALIGNED(CPU_CACHE_LINE_BYTES); +} test_context; + +static test_context test_instance; + +static void migration_task(rtems_task_argument arg) +{ + test_context *ctx = (test_context *) arg; + uint32_t cpu_count = rtems_get_processor_count(); + uint32_t cpu_index = rtems_get_current_processor(); + + while (true) { + rtems_status_code sc; + + cpu_index = (cpu_index + 1) % cpu_count; + + sc = rtems_task_set_scheduler( + RTEMS_SELF, + ctx->scheduler_ids[cpu_index], + PRIO_MIGRATION + ); + + if (sc == RTEMS_UNSATISFIED) { + continue; + } + + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + rtems_test_assert(cpu_index == rtems_get_current_processor()); + ++ctx->migration_counter; + } +} + +static void scheduler_task(rtems_task_argument arg) +{ + test_context *ctx = (test_context *) arg; + uint32_t cpu_count = rtems_get_processor_count(); + uint32_t cpu_index = rtems_get_current_processor(); + + while (true) { + rtems_status_code sc; + + cpu_index = (cpu_index - 1) % cpu_count; + + if (cpu_index == 0) { + cpu_index = 1; + } + + do { + sc = rtems_scheduler_remove_processor( + ctx->scheduler_ids[cpu_index], + cpu_index + ); + } while (sc == RTEMS_RESOURCE_IN_USE); + + sc = rtems_scheduler_add_processor( + ctx->scheduler_ids[cpu_index], + cpu_index + ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + ++ctx->scheduler_counter; + } +} + +static void test(test_context *ctx) +{ + rtems_status_code sc; + uint32_t i; + + for (i = 0; i < rtems_get_processor_count(); ++i) { + sc = rtems_scheduler_ident(i, &ctx->scheduler_ids[i]); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + } + + sc = rtems_task_create( + rtems_build_name('M', 'I', 'G', 'R'), + PRIO_MIGRATION, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &ctx->migration_task + ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_start( + ctx->migration_task, + migration_task, + (rtems_task_argument) ctx + ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_create( + rtems_build_name('S', 'C', 'H', 'D'), + PRIO_SCHEDULER, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &ctx->scheduler_task + ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_start( + ctx->scheduler_task, + scheduler_task, + (rtems_task_argument) ctx + ); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_wake_after(10 * rtems_clock_get_ticks_per_second()); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_delete(ctx->migration_task); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_task_delete(ctx->scheduler_task); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + printf( + "migration counter = %" PRIu32 "\n" + "scheduler counter = %" PRIu32 "\n", + ctx->migration_counter, + ctx->scheduler_counter + ); +} + +static void Init(rtems_task_argument arg) +{ + rtems_resource_snapshot snapshot; + + TEST_BEGIN(); + rtems_resource_snapshot_take(&snapshot); + test(&test_instance); + rtems_test_assert(rtems_resource_snapshot_check(&snapshot)); + TEST_END(); + rtems_test_exit(0); +} + +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 3 + +#define CONFIGURE_SMP_APPLICATION + +#define CONFIGURE_SMP_MAXIMUM_PROCESSORS CPU_COUNT + +#define CONFIGURE_SCHEDULER_SIMPLE_SMP + +#include <rtems/scheduler.h> + +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(0); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(1); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(2); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(3); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(4); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(5); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(6); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(7); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(8); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(9); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(10); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(11); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(12); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(13); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(14); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(15); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(16); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(17); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(18); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(19); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(20); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(21); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(22); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(23); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(24); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(25); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(26); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(27); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(28); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(29); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(30); +RTEMS_SCHEDULER_CONTEXT_SIMPLE_SMP(31); + +#define CONFIGURE_SCHEDULER_CONTROLS \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(0, 0), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(1, 1), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(2, 2), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(3, 3), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(4, 4), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(5, 5), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(6, 6), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(7, 7), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(8, 8), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(9, 9), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(10, 10), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(11, 11), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(12, 12), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(13, 13), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(14, 14), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(15, 15), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(16, 16), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(17, 17), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(18, 18), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(19, 19), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(20, 20), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(21, 21), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(22, 22), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(23, 23), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(24, 24), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(25, 25), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(26, 26), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(27, 27), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(28, 28), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(29, 29), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(30, 30), \ + RTEMS_SCHEDULER_CONTROL_SIMPLE_SMP(31, 31) + +#define CONFIGURE_SMP_SCHEDULER_ASSIGNMENTS \ + RTEMS_SCHEDULER_ASSIGN(0, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_MANDATORY), \ + RTEMS_SCHEDULER_ASSIGN(1, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(2, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(3, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(4, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(5, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(6, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(7, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(8, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(9, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(10, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(11, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(12, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(13, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(14, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(15, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(16, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(17, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(18, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(19, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(20, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(21, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(22, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(23, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(24, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(25, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(26, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(27, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(28, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(29, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(30, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL), \ + RTEMS_SCHEDULER_ASSIGN(31, RTEMS_SCHEDULER_ASSIGN_PROCESSOR_OPTIONAL) + +#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT + +#include <rtems/confdefs.h> diff --git a/testsuites/smptests/smpscheduler04/smpscheduler04.doc b/testsuites/smptests/smpscheduler04/smpscheduler04.doc new file mode 100644 index 0000000000..91bf76b44c --- /dev/null +++ b/testsuites/smptests/smpscheduler04/smpscheduler04.doc @@ -0,0 +1,14 @@ +This file describes the directives and concepts tested by this test set. + +test set name: smpscheduler04 + +directives: + + - rtems_task_set_scheduler() + - rtems_scheduler_add_processor() + - rtems_scheduler_remove_processor() + +concepts: + + - Ensure that adding/removing a processor works with concurrent task + scheduler changes. diff --git a/testsuites/smptests/smpscheduler04/smpscheduler04.scn b/testsuites/smptests/smpscheduler04/smpscheduler04.scn new file mode 100644 index 0000000000..8f9be83944 --- /dev/null +++ b/testsuites/smptests/smpscheduler04/smpscheduler04.scn @@ -0,0 +1,4 @@ +*** BEGIN OF TEST SMPSCHEDULER 4 *** +migration counter = 935005 +scheduler counter = 903791 +*** END OF TEST SMPSCHEDULER 4 *** diff --git a/testsuites/sptests/spscheduler01/init.c b/testsuites/sptests/spscheduler01/init.c index 162d71ae3f..be9fed2c7f 100644 --- a/testsuites/sptests/spscheduler01/init.c +++ b/testsuites/sptests/spscheduler01/init.c @@ -411,6 +411,33 @@ static void test_scheduler_get_processors(void) #endif /* defined(__RTEMS_HAVE_SYS_CPUSET_H__) */ } +static void test_scheduler_add_remove_processors(void) +{ + rtems_status_code sc; + rtems_id scheduler_id; + + sc = rtems_scheduler_ident(BLUE, &scheduler_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_scheduler_add_processor(invalid_id, 0); + rtems_test_assert(sc == RTEMS_INVALID_ID); + + sc = rtems_scheduler_remove_processor(invalid_id, 0); + rtems_test_assert(sc == RTEMS_INVALID_ID); + + sc = rtems_scheduler_add_processor(scheduler_id, 1); + rtems_test_assert(sc == RTEMS_NOT_CONFIGURED); + + sc = rtems_scheduler_remove_processor(scheduler_id, 1); + rtems_test_assert(sc == RTEMS_INVALID_NUMBER); + + sc = rtems_scheduler_add_processor(scheduler_id, 0); + rtems_test_assert(sc == RTEMS_RESOURCE_IN_USE); + + sc = rtems_scheduler_remove_processor(scheduler_id, 0); + rtems_test_assert(sc == RTEMS_RESOURCE_IN_USE); +} + static void test_task_get_priority(void) { rtems_status_code sc; @@ -463,6 +490,7 @@ static void Init(rtems_task_argument arg) test_task_get_set_scheduler(); test_scheduler_ident(); test_scheduler_get_processors(); + test_scheduler_add_remove_processors(); test_task_get_priority(); rtems_test_assert(rtems_resource_snapshot_check(&snapshot)); |