From 21889eadb58b800f0cc0efbf89d49c43e467aa3c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 4 Aug 2011 15:02:06 +0000 Subject: 2011-08-04 Ricardo Aguirre PR 1881/tests * Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of pthread_rwlock_timedwrlock - not available, blocks. * psxtmrwlock05/.cvsignore, psxtmrwlock05/Makefile.am, psxtmrwlock05/init.c, psxtmrwlock05/psxtmrwlock05.doc: New files. --- testsuites/psxtmtests/ChangeLog | 8 ++ testsuites/psxtmtests/Makefile.am | 1 + testsuites/psxtmtests/configure.ac | 1 + testsuites/psxtmtests/psxtmrwlock05/.cvsignore | 2 + testsuites/psxtmtests/psxtmrwlock05/Makefile.am | 30 +++++ testsuites/psxtmtests/psxtmrwlock05/init.c | 143 +++++++++++++++++++++ .../psxtmtests/psxtmrwlock05/psxtmrwlock05.doc | 14 ++ testsuites/psxtmtests/psxtmtests_plan.csv | 2 +- 8 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 testsuites/psxtmtests/psxtmrwlock05/.cvsignore create mode 100644 testsuites/psxtmtests/psxtmrwlock05/Makefile.am create mode 100644 testsuites/psxtmtests/psxtmrwlock05/init.c create mode 100644 testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.doc (limited to 'testsuites') diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog index 8808d55851..f8ba4345e6 100644 --- a/testsuites/psxtmtests/ChangeLog +++ b/testsuites/psxtmtests/ChangeLog @@ -1,3 +1,11 @@ +2011-08-04 Ricardo Aguirre + + PR 1881/tests + * Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of + pthread_rwlock_timedwrlock - not available, blocks. + * psxtmrwlock05/.cvsignore, psxtmrwlock05/Makefile.am, + psxtmrwlock05/init.c, psxtmrwlock05/psxtmrwlock05.doc: New files. + 2011-08-04 Joel Sherrill * psxtmrwlock03/init.c: Fix abstime issue. Time is now reasonable. diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am index 122695feb5..9a77b6f5d9 100644 --- a/testsuites/psxtmtests/Makefile.am +++ b/testsuites/psxtmtests/Makefile.am @@ -25,6 +25,7 @@ SUBDIRS += psxtmrwlock01 SUBDIRS += psxtmrwlock02 SUBDIRS += psxtmrwlock03 SUBDIRS += psxtmrwlock04 +SUBDIRS += psxtmrwlock05 SUBDIRS += psxtmsem01 SUBDIRS += psxtmsem02 SUBDIRS += psxtmsem03 diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac index 13340291a0..43123bf2ad 100644 --- a/testsuites/psxtmtests/configure.ac +++ b/testsuites/psxtmtests/configure.ac @@ -97,6 +97,7 @@ psxtmrwlock01/Makefile psxtmrwlock02/Makefile psxtmrwlock03/Makefile psxtmrwlock04/Makefile +psxtmrwlock05/Makefile psxtmsem01/Makefile psxtmsem02/Makefile psxtmsem03/Makefile diff --git a/testsuites/psxtmtests/psxtmrwlock05/.cvsignore b/testsuites/psxtmtests/psxtmrwlock05/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/psxtmtests/psxtmrwlock05/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/psxtmtests/psxtmrwlock05/Makefile.am b/testsuites/psxtmtests/psxtmrwlock05/Makefile.am new file mode 100644 index 0000000000..f45b5126e2 --- /dev/null +++ b/testsuites/psxtmtests/psxtmrwlock05/Makefile.am @@ -0,0 +1,30 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = psxtmrwlock05 +psxtmrwlock05_SOURCES = init.c ../../tmtests/include/timesys.h \ + ../../support/src/tmtests_empty_function.c \ + ../../support/src/tmtests_support.c + +dist_rtems_tests_DATA = psxtmrwlock05.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 = $(psxtmrwlock05_OBJECTS) $(psxtmrwlock05_LDADD) +LINK_LIBS = $(psxtmrwlock05_LDLIBS) + +psxtmrwlock05$(EXEEXT): $(psxtmrwlock05_OBJECTS) $(psxtmrwlock05_DEPENDENCIES) + @rm -f psxtmrwlock05$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/psxtmtests/psxtmrwlock05/init.c b/testsuites/psxtmtests/psxtmrwlock05/init.c new file mode 100644 index 0000000000..ef9ac03191 --- /dev/null +++ b/testsuites/psxtmtests/psxtmrwlock05/init.c @@ -0,0 +1,143 @@ +/* + * 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; +struct timespec abstime; + +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_timedwrlock - not available, blocks", + end_time, + OPERATION_COUNT, + 0, + 0 + ); + + puts( "*** END OF POSIX TIME PSXTMRWLOCK 05 TEST ***" ); + + rtems_test_exit( 0 ); + return NULL; +} + +void *Middle( + void *argument +) +{ + int status; + + /* + * 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 write lock operation will be blocked + * because the other write operation has the lock + */ + status = pthread_rwlock_timedwrlock(&rwlock, &abstime); + rtems_test_assert( status == 0 ); + return NULL; +} + +void *POSIX_Init( + void *argument +) +{ + int i; + int status; + pthread_t threadId; + pthread_rwlockattr_t attr; + + puts( "\n\n*** POSIX TIME PSXTMRWLOCK 05 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 ); + + /* + * Timeout for 5 seconds from now. + */ + status = clock_gettime( CLOCK_REALTIME, &abstime ); + rtems_test_assert( !status ); + abstime.tv_sec += 5; + + /* + * 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 + * I decided to use timedwrlock just to continue in the timed line */ + 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/psxtmrwlock05/psxtmrwlock05.doc b/testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.doc new file mode 100644 index 0000000000..dde56d7fa5 --- /dev/null +++ b/testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.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_timedwrlock - not available, blocks diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv index 1310e64cb6..dceac4fde1 100644 --- a/testsuites/psxtmtests/psxtmtests_plan.csv +++ b/testsuites/psxtmtests/psxtmtests_plan.csv @@ -79,7 +79,7 @@ "pthread_rwlock_trywrlock - available","psxtmrwlock01","psxtmtest_single","Yes" "pthread_rwlock_trywrlock - not available",,"psxtmtest_single", "pthread_rwlock_timedwrlock - available","psxtmrwlock01","psxtmtest_single","Yes" -"pthread_rwlock_timedwrlock - not available, blocks",,"psxtmtest_blocking", +"pthread_rwlock_timedwrlock - not available, blocks","psxtmrwlock05","psxtmtest_blocking","Yes" ,,, "mq_open (first open)","psxtmmq01","psxtmtest_init_destroy", "mq_close (close of first)","psxtmmq01","psxtmtest_init_destroy", -- cgit v1.2.3