diff options
Diffstat (limited to 'testsuites/rhealstone')
-rw-r--r-- | testsuites/rhealstone/Makefile.am | 70 | ||||
-rw-r--r-- | testsuites/rhealstone/configure.ac | 35 | ||||
-rw-r--r-- | testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c | 1 | ||||
-rw-r--r-- | testsuites/rhealstone/rhilatency/ilatency.c | 27 | ||||
-rw-r--r-- | testsuites/rhealstone/rhmlatency/mlatency.c | 1 | ||||
-rw-r--r-- | testsuites/rhealstone/rhtaskpreempt/taskpreempt.c | 1 | ||||
-rw-r--r-- | testsuites/rhealstone/rhtaskswitch/taskswitch.c | 1 |
7 files changed, 13 insertions, 123 deletions
diff --git a/testsuites/rhealstone/Makefile.am b/testsuites/rhealstone/Makefile.am deleted file mode 100644 index bb214357fc..0000000000 --- a/testsuites/rhealstone/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -# -# Real-time Benchmarking -# - -ACLOCAL_AMFLAGS = -I ../aclocal - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am - -rhealstones = -rhealstone_screens = -rhealstone_docs = - -support_includes = -I$(top_srcdir)/../support/include - -if TEST_rhdeadlockbrk -rhealstones += rhdeadlockbrk -rhealstone_docs += rhdeadlockbrk/rhdeadlockbrk.adoc -rhdeadlockbrk_SOURCES = rhdeadlockbrk/deadlockbrk.c \ - ../tmtests/include/timesys.h -rhdeadlockbrk_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhdeadlockbrk) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include -endif - -if TEST_rhilatency -rhealstones += rhilatency -rhealstone_docs += rhilatency/rhilatency.adoc -rhilatency_SOURCES = rhilatency/ilatency.c \ - ../tmtests/include/timesys.h -rhilatency_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhilatency) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include -endif - -if TEST_rhmlatency -rhealstones += rhmlatency -rhealstone_docs += rhmlatency/rhmlatency.adoc -rhmlatency_SOURCES = rhmlatency/mlatency.c \ - ../tmtests/include/timesys.h -rhmlatency_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhmlatency) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include -endif - -if TEST_rhsemshuffle -rhealstones += rhsemshuffle -rhealstone_docs += rhsemshuffle/rhsemshuffle.adoc -rhsemshuffle_SOURCES = rhsemshuffle/semshuffle.c \ - ../tmtests/include/timesys.h -rhsemshuffle_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhsemshuffle) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include -endif - -if TEST_rhtaskpreempt -rhealstones += rhtaskpreempt -rhealstone_docs += rhtaskpreempt/rhtaskpreempt.adoc -rhtaskpreempt_SOURCES = rhtaskpreempt/taskpreempt.c \ - ../tmtests/include/timesys.h -rhtaskpreempt_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhtaskpreempt) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include -endif - -if TEST_rhtaskswitch -rhealstones += rhtaskswitch -rhealstone_docs += rhtaskswitch/rhtaskswitch.adoc -rhtaskswitch_SOURCES = rhtaskswitch/taskswitch.c \ - ../tmtests/include/timesys.h -rhtaskswitch_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rhtaskswitch) \ - $(support_includes) -I$(top_srcdir)/../tmtests/include -endif - -noinst_PROGRAMS = $(rhealstones) diff --git a/testsuites/rhealstone/configure.ac b/testsuites/rhealstone/configure.ac deleted file mode 100644 index 0457f35ab8..0000000000 --- a/testsuites/rhealstone/configure.ac +++ /dev/null @@ -1,35 +0,0 @@ -## Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.69]) -AC_INIT([rtems-c-src-tests-rhealstone],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) -AC_CONFIG_SRCDIR([rhtaskswitch]) -AC_CONFIG_HEADER([config.h]) -RTEMS_TOP([../..],[..]) -RTEMS_SOURCE_TOP -RTEMS_BUILD_TOP - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2]) -AM_MAINTAINER_MODE - -RTEMS_ENV_RTEMSBSP - -RTEMS_PROJECT_ROOT - -RTEMS_PROG_CC_FOR_TARGET - -RTEMS_CANONICALIZE_TOOLS - -RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) - -# BSP Test configuration -RTEMS_TEST_CHECK([rhdeadlockbrk]) -RTEMS_TEST_CHECK([rhilatency]) -RTEMS_TEST_CHECK([rhmlatency]) -RTEMS_TEST_CHECK([rhsemshuffle]) -RTEMS_TEST_CHECK([rhtaskpreempt]) -RTEMS_TEST_CHECK([rhtaskswitch]) - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c index 3538003a4a..8154c93338 100644 --- a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c +++ b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c @@ -206,7 +206,6 @@ rtems_task Task03( rtems_task_argument ignored ) #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER -#define CONFIGURE_TICKS_PER_TIMESLICE 0 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_TASKS 4 diff --git a/testsuites/rhealstone/rhilatency/ilatency.c b/testsuites/rhealstone/rhilatency/ilatency.c index f4a450795f..8985453619 100644 --- a/testsuites/rhealstone/rhilatency/ilatency.c +++ b/testsuites/rhealstone/rhilatency/ilatency.c @@ -22,7 +22,6 @@ #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER #define CONFIGURE_MAXIMUM_TASKS 2 -#define CONFIGURE_TICKS_PER_TIMESLICE 0 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_SCHEDULER_PRIORITY @@ -45,10 +44,6 @@ uint32_t Interrupt_nest; uint32_t timer_overhead; uint32_t Interrupt_enter_time; -rtems_isr Isr_handler( - rtems_vector_number vector -); - rtems_task Init( rtems_task_argument argument ) @@ -91,6 +86,19 @@ rtems_task Init( rtems_task_exit(); } +#ifdef TM27_USE_VECTOR_HANDLER +static rtems_isr Isr_handler( rtems_vector_number arg ) +#else +static void Isr_handler( void *arg ) +#endif +{ + (void) arg; + + /* See how long it took system to recognize interrupt */ + Interrupt_enter_time = benchmark_timer_read(); + Clear_tm27_intr(); +} + rtems_task Task_1( rtems_task_argument argument ) @@ -114,12 +122,3 @@ rtems_task Task_1( TEST_END(); rtems_test_exit( 0 ); } - -rtems_isr Isr_handler( - rtems_vector_number vector -) -{ - /* See how long it took system to recognize interrupt */ - Interrupt_enter_time = benchmark_timer_read(); - Clear_tm27_intr(); -} diff --git a/testsuites/rhealstone/rhmlatency/mlatency.c b/testsuites/rhealstone/rhmlatency/mlatency.c index a61e1917e5..76b1113644 100644 --- a/testsuites/rhealstone/rhmlatency/mlatency.c +++ b/testsuites/rhealstone/rhmlatency/mlatency.c @@ -151,7 +151,6 @@ rtems_task Task02( rtems_task_argument ignored ) #define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 1 #define CONFIGURE_MESSAGE_BUFFER_MEMORY \ CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE(1, MESSAGE_SIZE) -#define CONFIGURE_TICKS_PER_TIMESLICE 0 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_INIT diff --git a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c index c5d2b6c809..00534b094d 100644 --- a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c +++ b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c @@ -113,7 +113,6 @@ rtems_task Init( rtems_task_argument ignored ) /* configuration information */ #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER -#define CONFIGURE_TICKS_PER_TIMESLICE 0 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_INIT diff --git a/testsuites/rhealstone/rhtaskswitch/taskswitch.c b/testsuites/rhealstone/rhtaskswitch/taskswitch.c index a2cef9fe32..3bcf1ec354 100644 --- a/testsuites/rhealstone/rhtaskswitch/taskswitch.c +++ b/testsuites/rhealstone/rhtaskswitch/taskswitch.c @@ -115,7 +115,6 @@ rtems_task Init( rtems_task_argument ignored ) /* configuration information */ #define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER -#define CONFIGURE_TICKS_PER_TIMESLICE 0 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_MAXIMUM_TASKS 3 #define CONFIGURE_INIT |