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

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

8 files changed, 222 insertions, 3 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index 37f116f902..c5d3f6eeb8 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,5 +1,13 @@
 2011-08-04	Ricardo Aguirre <el.mastin@ymail.com>
 
+	PR 1888/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	pthread_rwlock_unlock - thread waiting, preempt.
+	* psxtmrwlock07/.cvsignore, psxtmrwlock07/Makefile.am,
+	psxtmrwlock07/init.c, psxtmrwlock07/psxtmrwlock07.doc: New files.
+
+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.
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 4262172554..2e005bbf63 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -27,6 +27,7 @@ SUBDIRS += psxtmrwlock03
 SUBDIRS += psxtmrwlock04
 SUBDIRS += psxtmrwlock05
 SUBDIRS += psxtmrwlock06
+SUBDIRS += psxtmrwlock07
 SUBDIRS += psxtmsem01
 SUBDIRS += psxtmsem02
 SUBDIRS += psxtmsem03
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 3b2bfa2c6d..db2d452d38 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -99,6 +99,7 @@ psxtmrwlock03/Makefile
 psxtmrwlock04/Makefile
 psxtmrwlock05/Makefile
 psxtmrwlock06/Makefile
+psxtmrwlock07/Makefile
 psxtmsem01/Makefile
 psxtmsem02/Makefile
 psxtmsem03/Makefile
diff --git a/testsuites/psxtmtests/psxtmrwlock07/.cvsignore b/testsuites/psxtmtests/psxtmrwlock07/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock07/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmrwlock07/Makefile.am b/testsuites/psxtmtests/psxtmrwlock07/Makefile.am
new file mode 100644
index 0000000000..63b336a4bb
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock07/Makefile.am
@@ -0,0 +1,31 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmrwlock07
+psxtmrwlock07_SOURCES  = init.c
+psxtmrwlock07_SOURCES += ../../tmtests/include/timesys.h
+psxtmrwlock07_SOURCES += ../../support/src/tmtests_empty_function.c
+psxtmrwlock07_SOURCES += ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmrwlock07.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 = $(psxtmrwlock07_OBJECTS) $(psxtmrwlock07_LDADD)
+LINK_LIBS = $(psxtmrwlock07_LDLIBS)
+
+psxtmrwlock07$(EXEEXT): $(psxtmrwlock07_OBJECTS) $(psxtmrwlock07_DEPENDENCIES)
+	@rm -f psxtmrwlock07$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmrwlock07/init.c b/testsuites/psxtmtests/psxtmrwlock07/init.c
new file mode 100644
index 0000000000..9c4c48137d
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock07/init.c
@@ -0,0 +1,162 @@
+/*
+ *  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 <tmacros.h>
+#include <timesys.h>
+#include "test_support.h"
+#include <pthread.h>
+#include <sched.h>
+#include <rtems/timerdrv.h>
+
+pthread_rwlock_t     rwlock;
+
+void *Low(
+  void *argument
+)
+{
+  int      status;
+  uint32_t end_time;
+
+  /* write locking */
+    status = pthread_rwlock_wrlock(&rwlock);
+  end_time = benchmark_timer_read();
+
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_rwlock_unlock - thread waiting, preempt",
+    end_time,
+    OPERATION_COUNT,
+    0,
+    0
+  );
+
+  puts( "*** END OF POSIX TIME TEST PSXTMRWLOCK 07 ***" );
+  rtems_test_exit( 0 );
+  return NULL;
+}
+
+void *Middle(
+  void *argument
+)
+{
+  int status;
+
+  /* write locking */
+  status =  pthread_rwlock_wrlock(&rwlock);
+  rtems_test_assert( status == 0 );
+
+    /* thread switch occurs */
+
+    status = pthread_rwlock_unlock(&rwlock); /*  unlock the rwlock */
+  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;
+  pthread_rwlockattr_t rw_attr;
+
+  puts( "\n\n*** POSIX TIME TEST PSXTMRWLOCK 07 ***" );
+
+  /*
+   * Deliberately create the lock BEFORE the threads.  This way the
+   * threads should preempt this thread and block as they are created.
+   */
+  status = pthread_rwlockattr_init( &rw_attr );
+  rtems_test_assert( status == 0 );
+  status = pthread_rwlock_init( &rwlock, &rw_attr );
+  rtems_test_assert( status == 0 );
+
+  /*
+   * Obtain the lock so the threads will block.
+   */
+  status = pthread_rwlock_wrlock(&rwlock);
+  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, &param );
+  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, &param );
+    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 lock.  Threads unblock and preempt.
+   */
+  benchmark_timer_initialize();
+
+    status = pthread_rwlock_unlock(&rwlock);
+      /* 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_RWLOCKS     1
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+/* end of file */
diff --git a/testsuites/psxtmtests/psxtmrwlock07/psxtmrwlock07.doc b/testsuites/psxtmtests/psxtmrwlock07/psxtmrwlock07.doc
new file mode 100644
index 0000000000..5e4732ae6a
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock07/psxtmrwlock07.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, preempt
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index 154fb4a2ba..2fa25a42be 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -68,16 +68,16 @@
 "pthread_rwlock_rdlock - available","psxtmrwlock01","psxtmtest_single","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_tryrdlock - not available","psxtmrwlock01","psxtmtest_single","Yes"
 "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","psxtmrwlock06",,"Yes"
-"pthread_rwlock_unlock - thread waiting, preempt",,,
+"pthread_rwlock_unlock - thread waiting, preempt","psxtmrwlock07",,"Yes"
 "pthread_rwlock_wrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_wrlock - not available, blocks","psxtmwrlock04","psxtmtest_blocking","Yes"
 "pthread_rwlock_trywrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
-"pthread_rwlock_trywrlock - not available",,"psxtmtest_single",
+"pthread_rwlock_trywrlock - not available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_timedwrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_timedwrlock - not available, blocks","psxtmrwlock05","psxtmtest_blocking","Yes"
 ,,,