Update #3881. --- cpukit/Makefile.am | 1 + cpukit/include/rtems/rtems/tasks.h | 18 ++++++++ cpukit/rtems/src/schedulermaptoposix.c | 81 +++++++++++++++++++++++++++++++++ testsuites/sptests/spscheduler01/init.c | 52 ++++++++++++++++++--- 4 files changed, 145 insertions(+), 7 deletions(-) create mode 100644 cpukit/rtems/src/schedulermaptoposix.c
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 85b427848a..f5374efab7 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -769,6 +769,7 @@ librtemscpu_a_SOURCES += rtems/src/schedulergetprocessorset.c librtemscpu_a_SOURCES += rtems/src/scheduleridentbyprocessor.c librtemscpu_a_SOURCES += rtems/src/scheduleridentbyprocessorset.c librtemscpu_a_SOURCES += rtems/src/schedulerident.c +librtemscpu_a_SOURCES += rtems/src/schedulermaptoposix.c librtemscpu_a_SOURCES += rtems/src/schedulerremoveprocessor.c librtemscpu_a_SOURCES += rtems/src/sem.c librtemscpu_a_SOURCES += rtems/src/semcreate.c diff --git a/cpukit/include/rtems/rtems/tasks.h b/cpukit/include/rtems/rtems/tasks.h index 307b1b13aa..9f4d918149 100644 --- a/cpukit/include/rtems/rtems/tasks.h +++ b/cpukit/include/rtems/rtems/tasks.h @@ -736,6 +736,24 @@ rtems_status_code rtems_scheduler_get_maximum_priority( rtems_task_priority *priority ); +/** + * @brief Map a task priority to the corresonding POSIX thread priority. + * + * @param scheduler_id Identifier of the scheduler instance. + * @param priority The task priority to map. + * @param[out] posix_priority Pointer to a POSIX thread priority value. + * + * @retval RTEMS_SUCCESSFUL Successful operation. + * @retval RTEMS_INVALID_ADDRESS The @a posix_priority parameter is @c NULL. + * @retval RTEMS_INVALID_ID Invalid scheduler instance identifier. + * @retval RTEMS_INVALID_PRIORITY Invalid task priority. + */ +rtems_status_code rtems_scheduler_map_to_posix_priority( + rtems_id scheduler_id, + rtems_task_priority priority, + int *posix_priority +); + /**@}*/ #ifdef __cplusplus diff --git a/cpukit/rtems/src/schedulermaptoposix.c b/cpukit/rtems/src/schedulermaptoposix.c new file mode 100644 index 0000000000..12215b89e1 --- /dev/null +++ b/cpukit/rtems/src/schedulermaptoposix.c @@ -0,0 +1,81 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup ClassicTasks + * + * @brief Implementation of rtems_scheduler_map_to_posix_priority(). + */ + +/* + * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/rtems/tasksimpl.h> +#include <rtems/posix/priorityimpl.h> +#include <rtems/score/schedulerimpl.h> + +rtems_status_code rtems_scheduler_map_to_posix_priority( + rtems_id scheduler_id, + rtems_task_priority priority, + int *posix_priority +) +{ + const Scheduler_Control *scheduler; + Priority_Control core_priority; + bool valid; + int maybe_priority; + + if ( posix_priority == NULL ) { + return RTEMS_INVALID_ADDRESS; + } + + scheduler = _Scheduler_Get_by_id( scheduler_id ); + if ( scheduler == NULL ) { + return RTEMS_INVALID_ID; + } + + core_priority = _RTEMS_Priority_To_core( scheduler, priority, &valid ); + if ( !valid ) { + return RTEMS_INVALID_PRIORITY; + } + + maybe_priority = _POSIX_Priority_From_core( scheduler, core_priority ); + + if ( maybe_priority < POSIX_SCHEDULER_MINIMUM_PRIORITY ) { + return RTEMS_INVALID_PRIORITY; + } + + if ( maybe_priority >= scheduler->maximum_priority ) { + return RTEMS_INVALID_PRIORITY; + } + + *posix_priority = maybe_priority; + return RTEMS_SUCCESSFUL; +} diff --git a/testsuites/sptests/spscheduler01/init.c b/testsuites/sptests/spscheduler01/init.c index f42e60c593..3b94adf36f 100644 --- a/testsuites/sptests/spscheduler01/init.c +++ b/testsuites/sptests/spscheduler01/init.c @@ -1,11 +1,5 @@ /* - * Copyright (c) 2014, 2018 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rt...@embedded-brains.de> + * Copyright (C) 2014, 2020 embedded brains GmbH (http://www.embedded-brains.de) * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at @@ -497,6 +491,49 @@ static void test_scheduler_get_max_prio(void) rtems_test_assert(priority == 255); } +static void test_scheduler_map_to_posix(void) +{ + rtems_status_code sc; + int posix_priority; + rtems_id scheduler_id; + + posix_priority = 123; + sc = rtems_scheduler_map_to_posix_priority(invalid_id, 1, &posix_priority); + rtems_test_assert(sc == RTEMS_INVALID_ID); + rtems_test_assert(posix_priority == 123); + + sc = rtems_task_get_scheduler(RTEMS_SELF, &scheduler_id); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + + sc = rtems_scheduler_map_to_posix_priority(scheduler_id, 1, NULL); + rtems_test_assert(sc == RTEMS_INVALID_ADDRESS); + + posix_priority = 123; + sc = rtems_scheduler_map_to_posix_priority(scheduler_id, 0, &posix_priority); + rtems_test_assert(sc == RTEMS_INVALID_PRIORITY); + rtems_test_assert(posix_priority == 123); + + posix_priority = 123; + sc = rtems_scheduler_map_to_posix_priority(scheduler_id, 255, &posix_priority); + rtems_test_assert(sc == RTEMS_INVALID_PRIORITY); + rtems_test_assert(posix_priority == 123); + + posix_priority = 123; + sc = rtems_scheduler_map_to_posix_priority(scheduler_id, 256, &posix_priority); + rtems_test_assert(sc == RTEMS_INVALID_PRIORITY); + rtems_test_assert(posix_priority == 123); + + posix_priority = 123; + sc = rtems_scheduler_map_to_posix_priority(scheduler_id, 1, &posix_priority); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + rtems_test_assert(posix_priority == 254); + + posix_priority = 123; + sc = rtems_scheduler_map_to_posix_priority(scheduler_id, 254, &posix_priority); + rtems_test_assert(sc == RTEMS_SUCCESSFUL); + rtems_test_assert(posix_priority == 1); +} + static void test_scheduler_get_processors(void) { rtems_status_code sc; @@ -625,6 +662,7 @@ static void Init(rtems_task_argument arg) test_task_get_set_scheduler(); test_scheduler_ident(); test_scheduler_get_max_prio(); + test_scheduler_map_to_posix(); test_scheduler_get_processors(); test_scheduler_add_remove_processors(); test_task_get_priority(); -- 2.16.4 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
