diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-26 13:38:42 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-26 13:38:42 +0000 |
commit | 99a074de90650c87eed727cf9fd7693e2978fcbb (patch) | |
tree | 7613ec1090467a0401cdc17ac843307835d432e0 | |
parent | 2011-07-26 Ricardo Aguirre <el.mastin@ymail.com> (diff) | |
download | rtems-99a074de90650c87eed727cf9fd7693e2978fcbb.tar.bz2 |
2011-07-26 Ricardo Aguirre <el.mastin@ymail.com>
PR 1850/tests
* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
sem_post - thread waiting, preempt.
* psxtmsem05/.cvsignore, psxtmsem05/Makefile.am, psxtmsem05/init.c,
psxtmsem05/psxtmsem05.doc: New files.
-rw-r--r-- | testsuites/psxtmtests/ChangeLog | 8 | ||||
-rw-r--r-- | testsuites/psxtmtests/Makefile.am | 1 | ||||
-rw-r--r-- | testsuites/psxtmtests/configure.ac | 1 | ||||
-rw-r--r-- | testsuites/psxtmtests/psxtmsem05/.cvsignore | 2 | ||||
-rw-r--r-- | testsuites/psxtmtests/psxtmsem05/Makefile.am | 30 | ||||
-rw-r--r-- | testsuites/psxtmtests/psxtmsem05/init.c | 163 | ||||
-rw-r--r-- | testsuites/psxtmtests/psxtmsem05/psxtmsem05.doc | 14 | ||||
-rw-r--r-- | testsuites/psxtmtests/psxtmtests_plan.csv | 2 |
8 files changed, 220 insertions, 1 deletions
diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog index 12bf917ef1..d6b40343f4 100644 --- a/testsuites/psxtmtests/ChangeLog +++ b/testsuites/psxtmtests/ChangeLog @@ -1,5 +1,13 @@ 2011-07-26 Ricardo Aguirre <el.mastin@ymail.com> + PR 1850/tests + * Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of + sem_post - thread waiting, preempt. + * psxtmsem05/.cvsignore, psxtmsem05/Makefile.am, psxtmsem05/init.c, + psxtmsem05/psxtmsem05.doc: New files. + +2011-07-26 Ricardo Aguirre <el.mastin@ymail.com> + PR 1849/tests * Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of sem_post - thread waiting, no preempt. diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am index 35c62cbebc..656d5158db 100644 --- a/testsuites/psxtmtests/Makefile.am +++ b/testsuites/psxtmtests/Makefile.am @@ -21,6 +21,7 @@ SUBDIRS += psxtmnanosleep02 SUBDIRS += psxtmsem01 SUBDIRS += psxtmsem02 SUBDIRS += psxtmsem04 +SUBDIRS += psxtmsem05 SUBDIRS += psxtmsleep01 SUBDIRS += psxtmsleep02 SUBDIRS += psxtmthread01 diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac index e87a9d62f0..fabcf7295e 100644 --- a/testsuites/psxtmtests/configure.ac +++ b/testsuites/psxtmtests/configure.ac @@ -93,6 +93,7 @@ psxtmnanosleep02/Makefile psxtmsem01/Makefile psxtmsem02/Makefile psxtmsem04/Makefile +psxtmsem05/Makefile psxtmsleep01/Makefile psxtmsleep02/Makefile psxtmthread01/Makefile diff --git a/testsuites/psxtmtests/psxtmsem05/.cvsignore b/testsuites/psxtmtests/psxtmsem05/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/psxtmtests/psxtmsem05/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/psxtmtests/psxtmsem05/Makefile.am b/testsuites/psxtmtests/psxtmsem05/Makefile.am new file mode 100644 index 0000000000..cd3277d79e --- /dev/null +++ b/testsuites/psxtmtests/psxtmsem05/Makefile.am @@ -0,0 +1,30 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = psxtmsem05 +psxtmsem05_SOURCES = init.c ../../tmtests/include/timesys.h \ + ../../support/src/tmtests_empty_function.c \ + ../../support/src/tmtests_support.c + +dist_rtems_tests_DATA = psxtmsem05.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 = $(psxtmsem05_OBJECTS) $(psxtmsem05_LDADD) +LINK_LIBS = $(psxtmsem05_LDLIBS) + +psxtmsem05$(EXEEXT): $(psxtmsem05_OBJECTS) $(psxtmsem05_DEPENDENCIES) + @rm -f psxtmsem05$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/psxtmtests/psxtmsem05/init.c b/testsuites/psxtmtests/psxtmsem05/init.c new file mode 100644 index 0000000000..769c141623 --- /dev/null +++ b/testsuites/psxtmtests/psxtmsem05/init.c @@ -0,0 +1,163 @@ +/* + * COPYRIGHT (c) 1989-2011. + * 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. + * + * $Id$ + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <errno.h> +#include <fcntl.h> +#include <semaphore.h> +#include <coverhd.h> +#include <tmacros.h> +#include <timesys.h> +#include "test_support.h" +#include <pthread.h> +#include <sched.h> +#include <rtems/timerdrv.h> + +#define MAX_SEMS 2 + +sem_t sem1; + +void *Low( + void *argument +) +{ + int status; + uint32_t end_time; + + status = sem_wait(&sem1); /* semaphore blocks */ + end_time = benchmark_timer_read(); + + rtems_test_assert( status == 0 ); + + put_time( + "sem_post - thread waiting, preempt", + end_time, + OPERATION_COUNT, + 0, + 0 + ); + + puts( "*** END OF POSIX TIME TEST PSXTMSEM05 ***" ); + rtems_test_exit( 0 ); + return NULL; +} + +void *Middle( + void *argument +) +{ + int status; + + status = sem_wait(&sem1); /* semaphore blocks */ + rtems_test_assert( status == 0 ); + + /* thread switch occurs */ + + status = sem_post(&sem1); + rtems_test_assert( status == 0 ); + + /* thread switch occurs */ + + /* should never return */ + rtems_test_assert( FALSE ); + return NULL; +} + +void *POSIX_Init( + void *argument +) +{ + int i; + int status; + pthread_t threadId; + pthread_attr_t attr; + struct sched_param param; + + puts( "\n\n*** POSIX TIME TEST PSXTMSEM05 ***" ); + + /* + * Deliberately create the semaphore BEFORE the threads. This way the + * threads should preempt this thread and block as they are created. + */ + status = sem_init( &sem1, 0, 1 ); + rtems_test_assert( status == 0 ); + + /* + * Obtain the semaphore so the threads will block. + */ + status = sem_wait( &sem1 ); + rtems_test_assert( status == 0 ); + + /* + * Now lower our priority + */ + status = pthread_attr_init( &attr ); + rtems_test_assert( status == 0 ); + + status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED ); + rtems_test_assert( status == 0 ); + + status = pthread_attr_setschedpolicy( &attr, SCHED_RR ); + rtems_test_assert( status == 0 ); + + param.sched_priority = 2; + status = pthread_attr_setschedparam( &attr, ¶m ); + rtems_test_assert( status == 0 ); + + /* + * And create rest of threads as more important than we are. They + * will preempt us as they are created and block. + */ + for ( i=0 ; i < OPERATION_COUNT ; i++ ) { + + param.sched_priority = 3 + i; + status = pthread_attr_setschedparam( &attr, ¶m ); + rtems_test_assert( status == 0 ); + + status = pthread_create( + &threadId, + &attr, + (i == OPERATION_COUNT - 1) ? Low : Middle, + NULL + ); + rtems_test_assert( status == 0 ); + } + + /* + * Now start the timer which will be stopped in Low. + * Release the semaphore so threads unblock and preempt. + */ + benchmark_timer_initialize(); + + status = sem_post( &sem1 ); + /* thread switch occurs */ + + /* should never return */ + rtems_test_assert( FALSE ); + return NULL; +} + +/* configuration information */ + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER + +#define CONFIGURE_MAXIMUM_POSIX_THREADS OPERATION_COUNT + 2 +#define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES MAX_SEMS +#define CONFIGURE_POSIX_INIT_THREAD_TABLE + +#define CONFIGURE_INIT + +#include <rtems/confdefs.h> + /* end of file */ diff --git a/testsuites/psxtmtests/psxtmsem05/psxtmsem05.doc b/testsuites/psxtmtests/psxtmsem05/psxtmsem05.doc new file mode 100644 index 0000000000..5adfc5ebc1 --- /dev/null +++ b/testsuites/psxtmtests/psxtmsem05/psxtmsem05.doc @@ -0,0 +1,14 @@ +# +# $Id$ +# +# COPYRIGHT (c) 1989-2011. +# 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: + ++ sem_post - thread waiting, preempt diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv index 15e3cc1dc1..a79ec90ac7 100644 --- a/testsuites/psxtmtests/psxtmtests_plan.csv +++ b/testsuites/psxtmtests/psxtmtests_plan.csv @@ -112,7 +112,7 @@ "sem_trywait - not available","psxtmsem02","psxtmtest_single","Yes" "sem_post - no threads waiting","psxtmsem02","psxtmtest_single","Yes" "sem_post - thread waiting, no preempt","psxsemtm04","psxtmtest_unblocking_nopreempt","Yes" -"sem_post - thread waiting, preempt",,"psxtmtest_unblocking_preempt", +"sem_post - thread waiting, preempt","psxtmsem05","psxtmtest_unblocking_preempt", "sem_getvalue","psxtmsem02","psxtmtest_single","Yes" ,,, "sleep - yield","psxtmsleep01","psxtmtest_single","Yes" |