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

	PR 1887/tests
	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	pthread_rwlock_unlock - thread waiting, no preempt.
	* psxtmrwlock06/.cvsignore, psxtmrwlock06/Makefile.am,
	psxtmrwlock06/init.c, psxtmrwlock06/psxtmrwlock06.doc: New files.

8 files changed, 163 insertions, 1 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index d022aa964d..37f116f902 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,5 +1,13 @@
 2011-08-04	Ricardo Aguirre <el.mastin@ymail.com>
 
+	PR 1887/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	pthread_rwlock_unlock - thread waiting, no preempt.
+	* psxtmrwlock06/.cvsignore, psxtmrwlock06/Makefile.am,
+	psxtmrwlock06/init.c, psxtmrwlock06/psxtmrwlock06.doc: New files.
+
+2011-08-04	Ricardo Aguirre <el.mastin@ymail.com>
+
 	* psxtmrwlock01/init.c, psxtmrwlock01/psxtmrwlock01.doc: Update.
 
 2011-08-04	Ricardo Aguirre <el.mastin@ymail.com>
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 9a77b6f5d9..4262172554 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -26,6 +26,7 @@ SUBDIRS += psxtmrwlock02
 SUBDIRS += psxtmrwlock03
 SUBDIRS += psxtmrwlock04
 SUBDIRS += psxtmrwlock05
+SUBDIRS += psxtmrwlock06
 SUBDIRS += psxtmsem01
 SUBDIRS += psxtmsem02
 SUBDIRS += psxtmsem03
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 43123bf2ad..3b2bfa2c6d 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -98,6 +98,7 @@ psxtmrwlock02/Makefile
 psxtmrwlock03/Makefile
 psxtmrwlock04/Makefile
 psxtmrwlock05/Makefile
+psxtmrwlock06/Makefile
 psxtmsem01/Makefile
 psxtmsem02/Makefile
 psxtmsem03/Makefile
diff --git a/testsuites/psxtmtests/psxtmrwlock06/.cvsignore b/testsuites/psxtmtests/psxtmrwlock06/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock06/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmrwlock06/Makefile.am b/testsuites/psxtmtests/psxtmrwlock06/Makefile.am
new file mode 100644
index 0000000000..806e85df7f
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock06/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmrwlock06
+psxtmrwlock06_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmrwlock06.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 = $(psxtmrwlock06_OBJECTS) $(psxtmrwlock06_LDADD)
+LINK_LIBS = $(psxtmrwlock06_LDLIBS)
+
+psxtmrwlock06$(EXEEXT): $(psxtmrwlock06_OBJECTS) $(psxtmrwlock06_DEPENDENCIES)
+	@rm -f psxtmrwlock06$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmrwlock06/init.c b/testsuites/psxtmtests/psxtmrwlock06/init.c
new file mode 100644
index 0000000000..282f917fd5
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock06/init.c
@@ -0,0 +1,106 @@
+/*
+ *  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 <coverhd.h>
+#include <pthread.h>
+#include <sched.h>
+#include <tmacros.h>
+#include <timesys.h>
+#include "test_support.h"
+#include <rtems/timerdrv.h>
+
+pthread_rwlock_t     rwlock;
+
+void *Blocker(
+  void *argument
+)
+{
+  (void) pthread_rwlock_wrlock(&rwlock);
+  /* should never return */
+  rtems_test_assert( FALSE );
+
+  return NULL;
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+  int                   status;
+  pthread_t             threadId;
+  long                  end_time;
+  pthread_rwlockattr_t  attr;
+
+  puts( "\n\n*** POSIX TIME TEST PSXTMRWLOCK 06 ***" );
+
+  status = pthread_create( &threadId, NULL, Blocker, NULL );
+  rtems_test_assert( status == 0 );
+  /*
+   * Deliberately create the rwlock after the threads.  This way if the
+   * threads do run before we intend, they will get an error.
+   */
+
+  /* creating rwlock */
+    status = pthread_rwlockattr_init( &attr );
+  rtems_test_assert( status == 0 );
+  status = pthread_rwlock_init( &rwlock, &attr );
+  rtems_test_assert( status == 0 );
+
+  /*
+   * Ensure the rwlock is unavailable so the other threads block.
+   */
+  /* lock rwlock to ensure thread blocks */
+  status = pthread_rwlock_wrlock(&rwlock);
+  rtems_test_assert( status == 0 );
+
+  /*
+   * Let the other thread start so the thread startup overhead,
+   * is accounted for.  When we return, we can start the benchmark.
+   */
+  sched_yield();
+    /* let other thread run */
+
+  benchmark_timer_initialize();
+    status = pthread_rwlock_unlock(&rwlock); /*  unlock the rwlock */
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_unlock - thread waiting, no preempt",
+    end_time,
+    1,
+    0,
+    0
+  );
+
+  puts( "*** END OF POSIX TIME TEST PSXTMRWLOCK 06 ***" );
+  rtems_test_exit( 0 );
+
+  return NULL;
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS     2
+#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/psxtmrwlock06/psxtmrwlock06.doc b/testsuites/psxtmtests/psxtmrwlock06/psxtmrwlock06.doc
new file mode 100644
index 0000000000..4e4fb196ea
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock06/psxtmrwlock06.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_unlock - thread waiting, no preempt
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index dceac4fde1..154fb4a2ba 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -72,7 +72,7 @@
 "pthread_rwlock_timedrdlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "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, no preempt","psxtmrwlock06",,"Yes"
 "pthread_rwlock_unlock - thread waiting, preempt",,,
 "pthread_rwlock_wrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_wrlock - not available, blocks","psxtmwrlock04","psxtmtest_blocking","Yes"