2011-07-15 Ricardo Aguirre <el.mastin@ymail.com>

	PR 1835/tests
	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	mutex set and get priority ceiling.
	* psxtmmutex07/.cvsignore, psxtmmutex07/Makefile.am,
	psxtmmutex07/init.c, psxtmmutex07/psxtmmutex07.doc: New files.

8 files changed, 161 insertions, 2 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index cae066f69d..3a75f93ec4 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-15	Ricardo Aguirre <el.mastin@ymail.com>
+
+	PR 1835/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	mutex set and get priority ceiling.
+	* psxtmmutex07/.cvsignore, psxtmmutex07/Makefile.am,
+	psxtmmutex07/init.c, psxtmmutex07/psxtmmutex07.doc: New files.
+
 2011-07-13	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* psxtmtests_plan.csv: Update to reflect next activities.
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 3522322169..38a0f14e6e 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -10,6 +10,7 @@ if HAS_POSIX
 SUBDIRS += psxtmmutex01
 SUBDIRS += psxtmmutex02
 SUBDIRS += psxtmmutex03
+SUBDIRS += psxtmmutex07
 SUBDIRS += psxtmnanosleep01
 SUBDIRS += psxtmnanosleep02
 SUBDIRS += psxtmsleep01
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 35b26c6534..f0c86e139d 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -82,6 +82,8 @@ AC_CONFIG_FILES([Makefile
 psxtmmutex01/Makefile
 psxtmmutex02/Makefile
 psxtmmutex03/Makefile
+psxtmmutex04/Makefile
+psxtmmutex07/Makefile
 psxtmnanosleep01/Makefile
 psxtmnanosleep02/Makefile
 psxtmsleep01/Makefile
diff --git a/testsuites/psxtmtests/psxtmmutex07/.cvsignore b/testsuites/psxtmtests/psxtmmutex07/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex07/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmmutex07/Makefile.am b/testsuites/psxtmtests/psxtmmutex07/Makefile.am
new file mode 100644
index 0000000000..c573099fd0
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex07/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmmutex07
+psxtmmutex07_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmmutex07.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 = $(psxtmmutex07_OBJECTS) $(psxtmmutex07_LDADD)
+LINK_LIBS = $(psxtmmutex07_LDLIBS)
+
+psxtmmutex07$(EXEEXT): $(psxtmmutex07_OBJECTS) $(psxtmmutex07_DEPENDENCIES)
+	@rm -f psxtmmutex07$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmmutex07/init.c b/testsuites/psxtmtests/psxtmmutex07/init.c
new file mode 100644
index 0000000000..890116fc1e
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex07/init.c
@@ -0,0 +1,101 @@
+/*
+ *  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 <timesys.h>
+#include <rtems/timerdrv.h>
+#include <errno.h>
+#include <pthread.h>
+#include "test_support.h"
+
+pthread_mutex_t MutexId;
+
+void test_mutex_setprioceiling(void)
+{
+  long end_time;
+  int  status;
+  int  old_ceiling;
+
+  benchmark_timer_initialize();
+    status = pthread_mutex_setprioceiling( &MutexId, 5, &old_ceiling );
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_mutex_setprioceiling",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void test_mutex_getprioceiling(void)
+{
+  long end_time;
+  int  status;
+  int  current_ceiling;
+
+  benchmark_timer_initialize();
+    status = pthread_mutex_getprioceiling( &MutexId, &current_ceiling );
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_mutex_getprioceiling",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+  int  status;
+
+  puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX07 ***" );
+  /* create mutex*/
+  status = pthread_mutex_init( &MutexId, NULL );
+  rtems_test_assert( status == 0 );
+
+  test_mutex_getprioceiling();
+  test_mutex_setprioceiling();
+  test_mutex_getprioceiling();
+
+  /* destroy mutex */
+  status = pthread_mutex_destroy( &MutexId );
+  rtems_test_assert( status == 0 );
+  
+  puts( "*** END OF POSIX TIME TEST PSXTMMUTEX07 ***" );
+
+  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_MUTEXES     1
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+/* end of file */
diff --git a/testsuites/psxtmtests/psxtmmutex07/psxtmmutex07.doc b/testsuites/psxtmtests/psxtmmutex07/psxtmmutex07.doc
new file mode 100644
index 0000000000..f45904643a
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex07/psxtmmutex07.doc
@@ -0,0 +1,15 @@
+#
+#  $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_setprioceiling
++ pthread_mutex_getprioceiling
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index 4e27a103a9..8c20627eb5 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -10,8 +10,8 @@
 "pthread_mutex_unlock - thread waiting, preempt","psxtmmutex06","psxtmtest_unblocking_preempt",
 "pthread_mutex_timedlock - available","psxtmmutex03","psxtmtest_single","Yes"
 "pthread_mutex_timedlock - not available, block","psxtmmutex04","psxtmtest_blocking",
-"pthread_mutex_setprioceiling","psxtmmutex07","psxtmtest_single",
-"pthread_mutex_getprioceiling","psxtmmutex07","psxtmtest_single",
+"pthread_mutex_setprioceiling","psxtmmutex07","psxtmtest_single","Yes"
+"pthread_mutex_getprioceiling","psxtmmutex07","psxtmtest_single","Yes"
 ,,,
 "pthread_cond_init",,"psxtmtest_init_destroy",
 "pthread_cond_destroy",,"psxtmtest_init_destroy",