--- cpukit/score/Makefile.am | 1 + cpukit/score/src/sched.c | 70 ++++++++++++++++++++++++++ testsuites/sptests/spsyslock01/init.c | 17 +++++++ testsuites/sptests/spsyslock01/spsyslock01.doc | 5 ++ 4 files changed, 93 insertions(+) create mode 100644 cpukit/score/src/sched.c
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 6f0c4db..5c35611 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -349,6 +349,7 @@ libscore_a_SOURCES += src/profilingisrentryexit.c libscore_a_SOURCES += src/mutex.c libscore_a_SOURCES += src/once.c libscore_a_SOURCES += src/resourceiterate.c +libscore_a_SOURCES += src/sched.c libscore_a_SOURCES += src/semaphore.c libscore_a_SOURCES += src/smpbarrierwait.c libscore_a_SOURCES += src/kern_tc.c diff --git a/cpukit/score/src/sched.c b/cpukit/score/src/sched.c new file mode 100644 index 0000000..e694564 --- /dev/null +++ b/cpukit/score/src/sched.c @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2015 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * <rt...@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. + */ + +#if HAVE_CONFIG_H + #include "config.h" +#endif + +#include <sys/lock.h> + +#include <rtems/score/schedulerimpl.h> + +#if HAVE_STRUCT__THREAD_QUEUE_QUEUE + +int _Sched_Count( void ) +{ + return (int) _Scheduler_Count; +} + +int _Sched_Index( void ) +{ + Thread_Control *executing = _Thread_Get_executing(); + + return (int) _Scheduler_Get_index( _Scheduler_Get( executing ) ); +} + +int _Sched_Name_to_index( const char *name, size_t len ) +{ + uint32_t name_32 = 0; + size_t i = 0; + + while ( i < 4 && i < len ) { + name_32 |= ( (uint32_t) ( (uint8_t) *name ) ) << ( ( 3 - i ) * 8 ); + ++name; + ++i; + } + + for ( i = 0 ; i < _Scheduler_Count ; ++i ) { + const Scheduler_Control *scheduler = &_Scheduler_Table[ i ]; + + if ( scheduler->name == name_32 ) { + return (int) i; + } + } + + return -1; +} + +int _Sched_Processor_count( int index ) +{ + size_t i = (size_t) index; + + if ( i < _Scheduler_Count ) { + return _Scheduler_Get_processor_count( &_Scheduler_Table[ i ] ); + } else { + return 0; + } +} + +#endif /* HAVE_STRUCT__THREAD_QUEUE_QUEUE */ diff --git a/testsuites/sptests/spsyslock01/init.c b/testsuites/sptests/spsyslock01/init.c index 57f6d35..1309847 100644 --- a/testsuites/sptests/spsyslock01/init.c +++ b/testsuites/sptests/spsyslock01/init.c @@ -209,6 +209,20 @@ static void test_futex(test_context *ctx) rtems_test_assert(ctx->eno == 0); } +static void test_sched(void) +{ + rtems_test_assert(_Sched_Index() == 0); + rtems_test_assert(_Sched_Name_to_index("", 0) == -1); + rtems_test_assert(_Sched_Name_to_index("b", 1) == -1); + rtems_test_assert(_Sched_Name_to_index("bl", 2) == -1); + rtems_test_assert(_Sched_Name_to_index("blu", 3) == -1); + rtems_test_assert(_Sched_Name_to_index("blue", 4) == 0); + rtems_test_assert(_Sched_Name_to_index("blueX", 5) == 0); + rtems_test_assert(_Sched_Processor_count(-1) == 0); + rtems_test_assert(_Sched_Processor_count(0) == 1); + rtems_test_assert(_Sched_Processor_count(1) == 0); +} + static void mid_task(rtems_task_argument arg) { rtems_test_assert(0); @@ -332,6 +346,7 @@ static void test(void) test_prio_inv_recursive(ctx); test_sem(ctx); test_futex(ctx); + test_sched(); send_events(ctx, EVENT_MTX_DEADLOCK); @@ -363,6 +378,8 @@ static void Init(rtems_task_argument arg) #define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_SCHEDULER_NAME rtems_build_name('b', 'l', 'u', 'e') + #define CONFIGURE_INIT #include <rtems/confdefs.h> diff --git a/testsuites/sptests/spsyslock01/spsyslock01.doc b/testsuites/sptests/spsyslock01/spsyslock01.doc index bf59ceb..c8ab182 100644 --- a/testsuites/sptests/spsyslock01/spsyslock01.doc +++ b/testsuites/sptests/spsyslock01/spsyslock01.doc @@ -22,9 +22,14 @@ directives: - _Futex_Wait() - _Futex_Wake() - _Futex_Destroy() + - _Sched_Count() + - _Sched_Index() + - _Sched_Name_to_index() + - _Sched_Processor_count() concepts: - Ensure that self-contained mutexes and recursive mutexes work. - Ensure that self-contained semaphores work. - Ensure that self-contained futexes work. + - Ensure that <sys/lock.h> scheduler support works. -- 1.8.4.5 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
