2011-07-20 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	pthread_mutex_unlock where it is unblocking threads with preemption.
	* psxtmmutex06/.cvsignore, psxtmmutex06/Makefile.am,
	psxtmmutex06/init.c, psxtmmutex06/psxtmmutex06.doc: New files.

8 files changed, 211 insertions, 2 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index 609d963ab9..e1c646f07b 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,5 +1,12 @@
 2011-07-20	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	pthread_mutex_unlock where it is unblocking threads with preemption.
+	* psxtmmutex06/.cvsignore, psxtmmutex06/Makefile.am,
+	psxtmmutex06/init.c, psxtmmutex06/psxtmmutex06.doc: New files.
+
+2011-07-20	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* psxtmmutex05/init.c: Fix test. Pattern was wrong.
 
 2011-07-20	Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index fe606c918e..8b911eab52 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -13,6 +13,7 @@ SUBDIRS += psxtmmutex01
 SUBDIRS += psxtmmutex02
 SUBDIRS += psxtmmutex03
 SUBDIRS += psxtmmutex05
+SUBDIRS += psxtmmutex06
 SUBDIRS += psxtmmutex07
 SUBDIRS += psxtmnanosleep01
 SUBDIRS += psxtmnanosleep02
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 2e43e92c66..5d1d96579e 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -85,6 +85,7 @@ psxtmmutex01/Makefile
 psxtmmutex02/Makefile
 psxtmmutex03/Makefile
 psxtmmutex05/Makefile
+psxtmmutex06/Makefile
 psxtmmutex07/Makefile
 psxtmnanosleep01/Makefile
 psxtmnanosleep02/Makefile
diff --git a/testsuites/psxtmtests/psxtmmutex06/.cvsignore b/testsuites/psxtmtests/psxtmmutex06/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex06/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmmutex06/Makefile.am b/testsuites/psxtmtests/psxtmmutex06/Makefile.am
new file mode 100644
index 0000000000..ec568e3a6f
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex06/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmmutex06
+psxtmmutex06_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmmutex06.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 = $(psxtmmutex06_OBJECTS) $(psxtmmutex06_LDADD)
+LINK_LIBS = $(psxtmmutex06_LDLIBS)
+
+psxtmmutex06$(EXEEXT): $(psxtmmutex06_OBJECTS) $(psxtmmutex06_DEPENDENCIES)
+	@rm -f psxtmmutex06$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c
new file mode 100644
index 0000000000..f4e974e033
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex06/init.c
@@ -0,0 +1,154 @@
+/*
+ *  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_mutex_t MutexId;
+
+void *Low(
+  void *argument
+)
+{
+  int      status;
+  uint32_t end_time;
+
+    status = pthread_mutex_lock( &MutexId );
+  end_time = benchmark_timer_read();
+
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_mutex_unlock (unblocking, prempt)",
+    end_time,
+    OPERATION_COUNT,
+    0,
+    0
+  );
+
+  puts( "*** END OF POSIX TIME TEST MUTEX 07 ***" );
+  rtems_test_exit( 0 );
+  return NULL;
+}
+
+void *Middle(
+  void *argument
+)
+{
+  int status;
+
+  status = pthread_mutex_lock( &MutexId );
+  rtems_test_assert( status == 0 );
+
+    /* thread switch occurs */
+
+  status = pthread_mutex_unlock( &MutexId );
+  rtems_test_assert( status == 0 );
+
+    /* thread switch occurs */
+
+  return NULL;
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+  int                 i;
+  int                 status;
+  pthread_t           threadId;
+  pthread_attr_t      attr;
+  struct sched_param  param;
+
+  puts( "\n\n*** POSIX TIME TEST MUTEX 02 ***" );
+
+  /*
+   * Deliberately create the mutex BEFORE the threads.  This way the
+   * threads should preempt this thread and block as they are created.
+   */
+  status = pthread_mutex_init( &MutexId, NULL );
+  rtems_test_assert( status == 0 );
+
+  /*
+   * Lock the mutex so the threads will block.
+   */
+  status = pthread_mutex_lock( &MutexId );
+  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
+   */
+  benchmark_timer_initialize();
+
+    status = pthread_mutex_unlock( &MutexId );
+    rtems_test_assert( status == 0 );
+
+      /* thread switch occurs */
+  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_MUTEXES     1
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+  /* end of file */
diff --git a/testsuites/psxtmtests/psxtmmutex06/psxtmmutex06.doc b/testsuites/psxtmtests/psxtmmutex06/psxtmmutex06.doc
new file mode 100644
index 0000000000..12618f7716
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex06/psxtmmutex06.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_mutex_unlock - thread waiting, preempt
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index e03ebf0410..cddf0f4b6d 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -6,8 +6,8 @@
 "pthread_mutex_trylock - available","psxtmmutex03","psxtmtest_single","Yes"
 "pthread_mutex_trylock - not available","psxtmmutex03","psxtmtest_single","Yes"
 "pthread_mutex_unlock - no threads waiting","psxtmmutex03","psxtmtest_single","Yes"
-"pthread_mutex_unlock - thread waiting, no preempt","psxtmmutex05","psxtmtest_unblocking_nopreempt",
-"pthread_mutex_unlock - thread waiting, preempt","psxtmmutex06","psxtmtest_unblocking_preempt",
+"pthread_mutex_unlock - thread waiting, no preempt","psxtmmutex05","psxtmtest_unblocking_nopreempt","Yes"
+"pthread_mutex_unlock - thread waiting, preempt","psxtmmutex06","psxtmtest_unblocking_preempt","Yes"
 "pthread_mutex_timedlock - available","psxtmmutex03","psxtmtest_single","Yes"
 "pthread_mutex_timedlock - not available, block","psxtmmutex04","psxtmtest_blocking","Yes"
 "pthread_mutex_setprioceiling","psxtmmutex07","psxtmtest_single","Yes"