From 7de5ef5f83b21391cf0fdd35ffb404705643776c Mon Sep 17 00:00:00 2001 From: Daniel Ramirez Date: Sat, 30 Nov 2013 01:26:42 -0600 Subject: psxtmtests: Added in new psxtmbarrier04 test, release, preempt --- testsuites/psxtmtests/Makefile.am | 1 + testsuites/psxtmtests/configure.ac | 1 + testsuites/psxtmtests/psxtmbarrier04/Makefile.am | 27 +++++++ testsuites/psxtmtests/psxtmbarrier04/init.c | 94 ++++++++++++++++++++++ .../psxtmtests/psxtmbarrier04/psxtmbarrier04.doc | 24 ++++++ testsuites/psxtmtests/psxtmtests_plan.csv | 2 +- 6 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 testsuites/psxtmtests/psxtmbarrier04/Makefile.am create mode 100644 testsuites/psxtmtests/psxtmbarrier04/init.c create mode 100644 testsuites/psxtmtests/psxtmbarrier04/psxtmbarrier04.doc diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am index 86e25363c0..b920047bef 100644 --- a/testsuites/psxtmtests/Makefile.am +++ b/testsuites/psxtmtests/Makefile.am @@ -6,6 +6,7 @@ if HAS_POSIX SUBDIRS += psxtmbarrier01 SUBDIRS += psxtmbarrier02 SUBDIRS += psxtmbarrier03 +SUBDIRS += psxtmbarrier04 SUBDIRS += psxtmcond01 SUBDIRS += psxtmcond02 SUBDIRS += psxtmcond03 diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac index 03aeb35cec..42be4bdc04 100644 --- a/testsuites/psxtmtests/configure.ac +++ b/testsuites/psxtmtests/configure.ac @@ -80,6 +80,7 @@ AC_CONFIG_FILES([Makefile psxtmbarrier01/Makefile psxtmbarrier02/Makefile psxtmbarrier03/Makefile +psxtmbarrier04/Makefile psxtmcond01/Makefile psxtmcond02/Makefile psxtmcond03/Makefile diff --git a/testsuites/psxtmtests/psxtmbarrier04/Makefile.am b/testsuites/psxtmtests/psxtmbarrier04/Makefile.am new file mode 100644 index 0000000000..afc351f41b --- /dev/null +++ b/testsuites/psxtmtests/psxtmbarrier04/Makefile.am @@ -0,0 +1,27 @@ +MANAGERS = all + +rtems_tests_PROGRAMS = psxtmbarrier04 +psxtmbarrier04_SOURCES = init.c +psxtmbarrier04_SOURCES += ../../tmtests/include/timesys.h +psxtmbarrier04_SOURCES += ../../support/src/tmtests_empty_function.c +psxtmbarrier04_SOURCES += ../../support/src/tmtests_support.c + +dist_rtems_tests_DATA = psxtmbarrier04.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +OPERATION_COUNT = @OPERATION_COUNT@ +AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include +AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT) +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(psxtmbarrier04_OBJECTS) $(psxtmbarrier04_LDADD) +LINK_LIBS = $(psxtmbarrier04_LDLIBS) + +psxtmbarrier04$(EXEEXT): $(psxtmbarrier04_OBJECTS) $(psxtmbarrier04_DEPENDENCIES) + @rm -f psxtmbarrier04$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c new file mode 100644 index 0000000000..598561916e --- /dev/null +++ b/testsuites/psxtmtests/psxtmbarrier04/init.c @@ -0,0 +1,94 @@ +/* + * COPYRIGHT (c) 1989-2013. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#include +#include +#include "test_support.h" +#include +#include +#include + +/* forward declarations to avoid warnings */ +void *POSIX_Init(void *argument); +void *Blocker(void *argument); + +#define N 2 +pthread_barrier_t barrier; + +void *Blocker( + void *argument +) +{ + benchmark_timer_t end_time; + + /* block on barrier wait, switch back to first thread */ + (void) pthread_barrier_wait( &barrier ); + + + /* preempt first thread and stop time */ + end_time = benchmark_timer_read(); + put_time( + "pthread_barrier_wait – releasing, preempt", + end_time, + 1, + 0, + 0 + ); + puts( "*** END OF POSIX TIME TEST PSXTMBARRIER 04 ***" ); + rtems_test_exit( 0 ); + +} + +void *POSIX_Init( + void *argument +) +{ + int status; + pthread_t threadId; + int policy; + struct sched_param param; + + puts( "\n\n*** POSIX TIME TEST PSXTMBARRIER 04 ***" ); + + status = pthread_create( &threadId, NULL, Blocker, NULL ); + rtems_test_assert( status == 0 ); + status = pthread_barrier_init( &barrier, NULL, N ); + rtems_test_assert( status == 0 ); + + /* yield to second thread so it can start up and block */ + sched_yield(); + + pthread_getschedparam(threadId, &policy, ¶m); + param.sched_priority = sched_get_priority_max(policy) - 1; + /* preempt doesn't occur here due to second thread being blocked */ + pthread_setschedparam(threadId, policy, ¶m); + + /* as soon as this thread waits on barrier, release occurs, 2nd thread + * preempts this one due to having a higher priority + */ + benchmark_timer_initialize(); + status = pthread_barrier_wait( &barrier ); +} + +/* configuration information */ + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER + +#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 +#define CONFIGURE_MAXIMUM_POSIX_BARRIERS 1 +#define CONFIGURE_POSIX_INIT_THREAD_TABLE + +#define CONFIGURE_INIT + +#include +/* end of file */ diff --git a/testsuites/psxtmtests/psxtmbarrier04/psxtmbarrier04.doc b/testsuites/psxtmtests/psxtmbarrier04/psxtmbarrier04.doc new file mode 100644 index 0000000000..ce591dbf63 --- /dev/null +++ b/testsuites/psxtmtests/psxtmbarrier04/psxtmbarrier04.doc @@ -0,0 +1,24 @@ +# COPYRIGHT (c) 1989-2012. +# On-Line Applications Research Corporation (OAR). +# +# The license and distribution terms for this file may be +# found in the file LICENSE in this distribution or at +# http://www.rtems.com/license/LICENSE. +# + +This test benchmarks the following operations: + ++ pthread_barrier_wait – releasing, preempt + +This file describes the directives and concepts tested by this test set. + +test set name: psxtmbarrier + +directives: ++ pthread_create ++ pthread_getschedparam ++ pthread_setschedparam ++ pthread_barrier_wait + +concepts: ++ Benchmark the release of a barrier and preempt diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv index a93b5109e1..215cf5b16f 100644 --- a/testsuites/psxtmtests/psxtmtests_plan.csv +++ b/testsuites/psxtmtests/psxtmtests_plan.csv @@ -59,7 +59,7 @@ "pthread_barrier_destroy","psxtmbarrier01","psxtmtest_init_destroy","Yes" "pthread_barrier_wait - blocking","psxtmbarrier02","psxtmtest_blocking","Yes" "pthread_barrier_wait - releasing: no preempt","psxtmbarrier03","psxtmtest_unblocking_nopreempt","Yes" -"pthread_barrier_wait - releasing: preempt","psxtmbarrier04","psxtmtest_unblocking_preempt","No" +"pthread_barrier_wait - releasing: preempt","psxtmbarrier04","psxtmtest_unblocking_preempt","Yes" ,,, "pthread_spin_init","psxspin01","psxtmtest_init_destroy","No" "pthread_spin_destroy","psxspin01","psxtmtest_init_destroy","No" -- cgit v1.2.3