2011-08-02 Ricardo Aguirre <el.mastin@ymail.com>

	PR 1874/tests
	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	multiple pthread_rwlock operations that can be done as single shot
	times.
	* psxtmrwlock01/.cvsignore, psxtmrwlock01/Makefile.am,
	psxtmrwlock01/init.c, psxtmrwlock01/psxtmrwlock01.doc: New files.

8 files changed, 329 insertions, 9 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index 2afd8abecd..27b26070f1 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-02	Ricardo Aguirre <el.mastin@ymail.com>
+
+	PR 1874/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	multiple pthread_rwlock operations that can be done as single shot
+	times.
+	* psxtmrwlock01/.cvsignore, psxtmrwlock01/Makefile.am,
+	psxtmrwlock01/init.c, psxtmrwlock01/psxtmrwlock01.doc: New files.
+
 2011-07-29	Ricardo Aguirre <el.mastin@ymail.com>
 
 	PR 1863/tests
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 4382fcf251..0dbe59e6e4 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -21,6 +21,7 @@ SUBDIRS += psxtmmutex06
 SUBDIRS += psxtmmutex07
 SUBDIRS += psxtmnanosleep01
 SUBDIRS += psxtmnanosleep02
+SUBDIRS += psxtmrwlock01
 SUBDIRS += psxtmsem01
 SUBDIRS += psxtmsem02
 SUBDIRS += psxtmsem03
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 1a56efc3bb..35d4600f4e 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -93,6 +93,7 @@ psxtmmutex06/Makefile
 psxtmmutex07/Makefile
 psxtmnanosleep01/Makefile
 psxtmnanosleep02/Makefile
+psxtmrwlock01//Makefile
 psxtmsem01/Makefile
 psxtmsem02/Makefile
 psxtmsem03/Makefile
diff --git a/testsuites/psxtmtests/psxtmrwlock01/.cvsignore b/testsuites/psxtmtests/psxtmrwlock01/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock01/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmrwlock01/Makefile.am b/testsuites/psxtmtests/psxtmrwlock01/Makefile.am
new file mode 100644
index 0000000000..aad366917f
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock01/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmrwlock01
+psxtmrwlock01_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmrwlock01.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 = $(psxtmrwlock01_OBJECTS) $(psxtmrwlock01_LDADD)
+LINK_LIBS = $(psxtmrwlock01_LDLIBS)
+
+psxtmrwlock01$(EXEEXT): $(psxtmrwlock01_OBJECTS) $(psxtmrwlock01_DEPENDENCIES)
+	@rm -f psxtmrwlock01$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmrwlock01/init.c b/testsuites/psxtmtests/psxtmrwlock01/init.c
new file mode 100644
index 0000000000..ef1c22ba72
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock01/init.c
@@ -0,0 +1,254 @@
+/*
+ *  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 <timesys.h>
+#include <rtems/timerdrv.h>
+#include <pthread.h>
+#include "test_support.h"
+
+pthread_rwlock_t     rwlock;
+
+void benchmark_pthread_rwlock_init(void)
+{
+  long end_time;
+  int  status;
+  pthread_rwlockattr_t attr;
+
+  pthread_rwlockattr_init( &attr );
+  benchmark_timer_initialize();
+    status = pthread_rwlock_init( &rwlock, &attr );
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_init",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void benchmark_pthread_rwlock_rdlock(void)
+{
+  long end_time;
+  int  status;
+
+  benchmark_timer_initialize();
+    status = pthread_rwlock_rdlock(&rwlock);
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_rdlock - available",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void benchmark_pthread_rwlock_unlock(bool do_print)
+{
+  long end_time;
+  int  status;
+
+  benchmark_timer_initialize();
+    status = pthread_rwlock_unlock(&rwlock);
+  end_time = benchmark_timer_read();
+  if ( status == EPERM )
+    puts( "The current thread does not own the read-write lock");
+  else
+    rtems_test_assert( status == 0 );
+
+  if ( do_print ) {
+    put_time(
+      "pthread_rwlock_unlock - available",
+      end_time,
+      1,        /* Only executed once */
+      0,
+      0
+    );
+  }
+}
+
+void benchmark_pthread_rwlock_tryrdlock(void)
+{
+  long end_time;
+  int  status;
+
+  benchmark_timer_initialize();
+    status = pthread_rwlock_tryrdlock(&rwlock);
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_tryrdlock - available",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void benchmark_pthread_rwlock_timedrdlock(void)
+{
+  long end_time;
+  int  status;
+
+  benchmark_timer_initialize();
+    status = pthread_rwlock_timedrdlock(&rwlock, 0);
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_timedrdlock - available",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void benchmark_pthread_rwlock_wrlock(void)
+{
+  long end_time;
+  int  status;
+
+  benchmark_timer_initialize();
+    status = pthread_rwlock_wrlock(&rwlock);
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_wrlock - available",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void benchmark_pthread_rwlock_trywrlock(void)
+{
+  long end_time;
+  int  status;
+
+  benchmark_timer_initialize();
+    status = pthread_rwlock_trywrlock(&rwlock);
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_trywrlock - available",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void benchmark_pthread_rwlock_timedwrlock(void)
+{
+  long end_time;
+  int  status;
+
+  benchmark_timer_initialize();
+    status = pthread_rwlock_timedwrlock(&rwlock,0);
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_timedwrlock - available",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void benchmark_pthread_rwlock_destroy(void)
+{
+  long end_time;
+  int  status;
+
+  benchmark_timer_initialize();
+    status = pthread_rwlock_destroy(&rwlock);
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_destroy",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+
+  puts( "\n\n*** POSIX TIME PSXTMRWLOCK 01  ***" );
+
+  /* initializing rwlock */
+  benchmark_pthread_rwlock_init();
+  /* applying a read lock */
+  benchmark_pthread_rwlock_rdlock();
+  /* unlocking rwlock */
+  benchmark_pthread_rwlock_unlock( true );
+  /* trying to apply a read lock when it is available */
+  benchmark_pthread_rwlock_tryrdlock();
+  /* unlocking rwlock */
+  benchmark_pthread_rwlock_unlock( false );
+  /* applying a timed read lock */
+  benchmark_pthread_rwlock_timedrdlock();
+  /* unlocking rwlock */
+  benchmark_pthread_rwlock_unlock( false );
+  /* applying a write lock */
+  benchmark_pthread_rwlock_wrlock();
+  /* unlocking rwlock */
+  benchmark_pthread_rwlock_unlock( false );
+  /* trying to apply a write lock, when it is available */
+  benchmark_pthread_rwlock_trywrlock();
+  /* unlocking rwlock */
+  benchmark_pthread_rwlock_unlock( false );
+  /* applying a timed write lock */
+  benchmark_pthread_rwlock_timedwrlock();
+  /* unlocking rwlock */
+  benchmark_pthread_rwlock_unlock( false );
+  /* destroying rwlock */
+  benchmark_pthread_rwlock_destroy();
+
+  puts( "*** END OF POSIX TIME PSXTMRWLOCK 01 ***" );
+  rtems_test_exit(0);
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS     1
+#define CONFIGURE_MAXIMUM_POSIX_RWLOCKS     1
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+/* end of file */
diff --git a/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc b/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc
new file mode 100644
index 0000000000..7ccf6efbeb
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc
@@ -0,0 +1,23 @@
+#
+#  $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_init 
++ pthread_rwlock_rdlock - available 
++ pthread_rwlock_unlock
++ pthread_rwlock_tryrdlock - available 
++ pthread_rwlock_timedrdlock - available 
++ pthread_rwlock_wrlock - available 
++ pthread_rwlock_trywrlock - available 
++ pthread_rwlock_timedwrlock - available 
++ pthread_rwlock_destroy 
+
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index a4d54417de..20299869a5 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -63,22 +63,22 @@
 "pthread_spin_trylock - not available",,"psxtmtest_single",
 "pthread_spin_unlock",,,
 ,,,
-"pthread_rwlock_init",,"psxtmtest_init_destroy",
-"pthread_rwlock_destroy",,"psxtmtest_init_destroy",
-"pthread_rwlock_rdlock - available",,"psxtmtest_single",
+"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",
-"pthread_rwlock_tryrdlock - available",,"psxtmtest_single",
+"pthread_rwlock_tryrdlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_tryrdlock - not available",,"psxtmtest_single",
-"pthread_rwlock_timedrdlock - available",,"psxtmtest_single",
+"pthread_rwlock_timedrdlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_timedrdlock - not available, blocks",,"psxtmtest_blocking",
-"pthread_rwlock_unlock - no threads waiting",,,
+"pthread_rwlock_unlock - no threads waiting","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_unlock - thread waiting, no preempt",,,
 "pthread_rwlock_unlock - thread waiting, preempt",,,
-"pthread_rwlock_wrlock - available",,"psxtmtest_single",
+"pthread_rwlock_wrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_wrlock - not available, blocks",,"psxtmtest_blocking",
-"pthread_rwlock_trywrlock - available",,"psxtmtest_single",
+"pthread_rwlock_trywrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_trywrlock - not available",,"psxtmtest_single",
-"pthread_rwlock_timedwrlock - available",,"psxtmtest_single",
+"pthread_rwlock_timedwrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_timedwrlock - not available, blocks",,"psxtmtest_blocking",
 ,,,
 "mq_open (first open)","psxtmmq01","psxtmtest_init_destroy",