From d83f90b1e418d1e60d522f70495501a204fe8bc9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 2 Aug 2011 15:17:17 +0000 Subject: 2011-08-02 Ricardo Aguirre PR 1878/tests * Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of pthread_rwlock_timedrdlock - not available, blocks. * psxtmrwlock03/.cvsignore, psxtmrwlock03/Makefile.am, psxtmrwlock03/init.c, psxtmrwlock03/psxtmrwlock03.doc: New files. --- testsuites/psxtmtests/ChangeLog | 8 ++ testsuites/psxtmtests/Makefile.am | 1 + testsuites/psxtmtests/configure.ac | 1 + testsuites/psxtmtests/psxtmrwlock03/.cvsignore | 2 + testsuites/psxtmtests/psxtmrwlock03/Makefile.am | 30 +++++ testsuites/psxtmtests/psxtmrwlock03/init.c | 141 +++++++++++++++++++++ .../psxtmtests/psxtmrwlock03/psxtmrwlock03.doc | 14 ++ testsuites/psxtmtests/psxtmtests_plan.csv | 4 +- 8 files changed, 199 insertions(+), 2 deletions(-) create mode 100644 testsuites/psxtmtests/psxtmrwlock03/.cvsignore create mode 100644 testsuites/psxtmtests/psxtmrwlock03/Makefile.am create mode 100644 testsuites/psxtmtests/psxtmrwlock03/init.c create mode 100644 testsuites/psxtmtests/psxtmrwlock03/psxtmrwlock03.doc (limited to 'testsuites') diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog index 0543112bf3..99c2222dc3 100644 --- a/testsuites/psxtmtests/ChangeLog +++ b/testsuites/psxtmtests/ChangeLog @@ -1,3 +1,11 @@ +2011-08-02 Ricardo Aguirre + + PR 1878/tests + * Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of + pthread_rwlock_timedrdlock - not available, blocks. + * psxtmrwlock03/.cvsignore, psxtmrwlock03/Makefile.am, + psxtmrwlock03/init.c, psxtmrwlock03/psxtmrwlock03.doc: New files. + 2011-08-02 Ricardo Aguirre PR 1875/tests diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am index 4a0c1eadbe..cbc2ff9e36 100644 --- a/testsuites/psxtmtests/Makefile.am +++ b/testsuites/psxtmtests/Makefile.am @@ -23,6 +23,7 @@ SUBDIRS += psxtmnanosleep01 SUBDIRS += psxtmnanosleep02 SUBDIRS += psxtmrwlock01 SUBDIRS += psxtmrwlock02 +SUBDIRS += psxtmrwlock03 SUBDIRS += psxtmsem01 SUBDIRS += psxtmsem02 SUBDIRS += psxtmsem03 diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac index e779538f69..94c09c9153 100644 --- a/testsuites/psxtmtests/configure.ac +++ b/testsuites/psxtmtests/configure.ac @@ -95,6 +95,7 @@ psxtmnanosleep01/Makefile psxtmnanosleep02/Makefile psxtmrwlock01/Makefile psxtmrwlock02/Makefile +psxtmrwlock03/Makefile psxtmsem01/Makefile psxtmsem02/Makefile psxtmsem03/Makefile diff --git a/testsuites/psxtmtests/psxtmrwlock03/.cvsignore b/testsuites/psxtmtests/psxtmrwlock03/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/psxtmtests/psxtmrwlock03/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/psxtmtests/psxtmrwlock03/Makefile.am b/testsuites/psxtmtests/psxtmrwlock03/Makefile.am new file mode 100644 index 0000000000..13650f4861 --- /dev/null +++ b/testsuites/psxtmtests/psxtmrwlock03/Makefile.am @@ -0,0 +1,30 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = psxtmrwlock03 +psxtmrwlock03_SOURCES = init.c ../../tmtests/include/timesys.h \ + ../../support/src/tmtests_empty_function.c \ + ../../support/src/tmtests_support.c + +dist_rtems_tests_DATA = psxtmrwlock03.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 = $(psxtmrwlock03_OBJECTS) $(psxtmrwlock03_LDADD) +LINK_LIBS = $(psxtmrwlock03_LDLIBS) + +psxtmrwlock03$(EXEEXT): $(psxtmrwlock03_OBJECTS) $(psxtmrwlock03_DEPENDENCIES) + @rm -f psxtmrwlock03$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/psxtmtests/psxtmrwlock03/init.c b/testsuites/psxtmtests/psxtmrwlock03/init.c new file mode 100644 index 0000000000..e6b901f610 --- /dev/null +++ b/testsuites/psxtmtests/psxtmrwlock03/init.c @@ -0,0 +1,141 @@ +/* + * 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 +#include +#include +#include +#include +#include +#include +#include "test_support.h" + +pthread_rwlock_t rwlock; + +void *Low( + void *argument +) +{ + uint32_t end_time; + + /* + * Now we have finished the thread startup overhead, + * so let other threads run. When we return, we can + * finish the benchmark. + */ + sched_yield(); + /* let other threads run */ + + end_time = benchmark_timer_read(); + + put_time( + "pthread_rwlock_timedrdlock - not available, blocks", + end_time, + OPERATION_COUNT, + 0, + 0 + ); + + puts( "*** END OF POSIX TIME PSXTMRWLOCK 03 TEST ***" ); + + rtems_test_exit( 0 ); + return NULL; +} + +void *Middle( + void *argument +) +{ + int status; + struct timespec abstime; + + abstime.tv_sec = 0; + abstime.tv_nsec = 0; + + /* + * Now we have finished the thread startup overhead, + * so let other threads run. When we return, we can + * finish the benchmark. + */ + sched_yield(); + /* let other threads run */ + + /* this timed read lock operation will be blocked + * cause a write operation has the lock */ + status = pthread_rwlock_timedrdlock(&rwlock, &abstime); + /*status should be non zero, cause read lock is refused... + * blocked during abstime */ + rtems_test_assert( status == ETIMEDOUT ); + return NULL; +} + +void *POSIX_Init( + void *argument +) +{ + int i; + int status; + pthread_t threadId; + pthread_rwlockattr_t attr; + + puts( "\n\n*** POSIX TIME PSXTMRWLOCK 03 TEST ***" ); + + for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) { + status = pthread_create( &threadId, NULL, Middle, NULL ); + rtems_test_assert( !status ); + } + + status = pthread_create( &threadId, NULL, Low, NULL ); + rtems_test_assert( !status ); + + /* + * Deliberately create the rwlock after the threads. This way if the + * threads do run before we intend, they will get an error. + */ + status = pthread_rwlockattr_init( &attr ); + rtems_test_assert( status == 0 ); + status = pthread_rwlock_init( &rwlock, &attr ); + rtems_test_assert( status == 0 ); + + /* + * Let the other threads start so the thread startup overhead, + * is accounted for. When we return, we can start the benchmark. + */ + sched_yield(); + /* let other threads run */ + + /* start the timer and switch through all the other tasks */ + benchmark_timer_initialize(); + + /* + * Write lock operation, this could be any write lock + */ + status = pthread_rwlock_timedwrlock(&rwlock,0); + rtems_test_assert( status == 0 ); + 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_RWLOCKS 1 +#define CONFIGURE_POSIX_INIT_THREAD_TABLE + +#define CONFIGURE_INIT + +#include +/* end of file */ diff --git a/testsuites/psxtmtests/psxtmrwlock03/psxtmrwlock03.doc b/testsuites/psxtmtests/psxtmrwlock03/psxtmrwlock03.doc new file mode 100644 index 0000000000..8eb5df98da --- /dev/null +++ b/testsuites/psxtmtests/psxtmrwlock03/psxtmrwlock03.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: + ++ pthread_rwlock_timedrdlock - not available, blocks diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv index f47cf79c99..27954b049d 100644 --- a/testsuites/psxtmtests/psxtmtests_plan.csv +++ b/testsuites/psxtmtests/psxtmtests_plan.csv @@ -66,11 +66,11 @@ "pthread_rwlock_init","psxtmrwlock01","psxtmtest_init_destroy","Yes" "pthread_rwlock_destroy","psxtmrwlock01","psxtmtest_init_destroy","Yes" "pthread_rwlock_rdlock - available","psxtmrwlock01","psxtmtest_single","Yes" -"pthread_rwlock_rdlock - not available, blocks",,"psxtmtest_blocking","Yes" +"pthread_rwlock_rdlock - not available, blocks","psxtmrwlock02","psxtmtest_blocking","Yes" "pthread_rwlock_tryrdlock - available","psxtmrwlock01","psxtmtest_single","Yes" "pthread_rwlock_tryrdlock - not available",,"psxtmtest_single", "pthread_rwlock_timedrdlock - available","psxtmrwlock01","psxtmtest_single","Yes" -"pthread_rwlock_timedrdlock - not available, blocks",,"psxtmtest_blocking", +"pthread_rwlock_timedrdlock - not available, blocks","psxtmrwlock03","psxtmtest_blocking","Yes" "pthread_rwlock_unlock - no threads waiting","psxtmrwlock01","psxtmtest_single","Yes" "pthread_rwlock_unlock - thread waiting, no preempt",,, "pthread_rwlock_unlock - thread waiting, preempt",,, -- cgit v1.2.3