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

	PR 1835/tests
	* Makefile.am, configure.ac: Add benchmark of pthread_mutex_timedlock -
	not available, block.
	* psxtmmutex04/.cvsignore, psxtmmutex04/Makefile.am,
	psxtmmutex04/init.c, psxtmmutex04/psxtmmutex04.doc: New files.

7 files changed, 184 insertions, 0 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index 5aafc0ba29..d46ba86942 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-21	Ricardo Aguirre <el.mastin@ymail.com>
+
+	PR 1835/tests
+	* Makefile.am, configure.ac: Add benchmark of pthread_mutex_timedlock -
+	not available, block.
+	* psxtmmutex04/.cvsignore, psxtmmutex04/Makefile.am,
+	psxtmmutex04/init.c, psxtmmutex04/psxtmmutex04.doc: New files.
+
 2011-07-21	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* psxtmmutex02/init.c, psxtmmutex05/init.c, psxtmmutex06/init.c,
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 8b911eab52..63fe7b1a6b 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -12,6 +12,7 @@ SUBDIRS += psxtmkey02
 SUBDIRS += psxtmmutex01
 SUBDIRS += psxtmmutex02
 SUBDIRS += psxtmmutex03
+SUBDIRS += psxtmmutex04
 SUBDIRS += psxtmmutex05
 SUBDIRS += psxtmmutex06
 SUBDIRS += psxtmmutex07
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 5d1d96579e..8ee9062d00 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -84,6 +84,7 @@ psxtmkey02/Makefile
 psxtmmutex01/Makefile
 psxtmmutex02/Makefile
 psxtmmutex03/Makefile
+psxtmmutex04/Makefile
 psxtmmutex05/Makefile
 psxtmmutex06/Makefile
 psxtmmutex07/Makefile
diff --git a/testsuites/psxtmtests/psxtmmutex04/.cvsignore b/testsuites/psxtmtests/psxtmmutex04/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex04/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmmutex04/Makefile.am b/testsuites/psxtmtests/psxtmmutex04/Makefile.am
new file mode 100644
index 0000000000..8839b8f0bf
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex04/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmmutex04
+psxtmmutex04_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmmutex04.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 = $(psxtmmutex04_OBJECTS) $(psxtmmutex04_LDADD)
+LINK_LIBS = $(psxtmmutex04_LDLIBS)
+
+psxtmmutex04$(EXEEXT): $(psxtmmutex04_OBJECTS) $(psxtmmutex04_DEPENDENCIES)
+	@rm -f psxtmmutex04$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmmutex04/init.c b/testsuites/psxtmtests/psxtmmutex04/init.c
new file mode 100644
index 0000000000..6d11495654
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex04/init.c
@@ -0,0 +1,128 @@
+/*
+ *  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 <tmacros.h>
+#include <rtems/timerdrv.h>
+#include "test_support.h"
+
+#include <pthread.h>
+#include <sched.h>
+
+pthread_mutex_t MutexId;
+
+void *Low(
+  void *argument
+)
+{  
+  uint32_t end_time;
+
+  /*
+   * Now we have finished the thread startup overhead,
+   * so let other threads run.  When we return, we can
+   * finish the benchmark.
+   */
+  sched_yield();
+    /* let other threads run */
+
+  end_time = benchmark_timer_read();
+
+  put_time(
+    "pthread_mutex_timedlock - not available, block",
+    end_time,
+    OPERATION_COUNT,
+    0,
+    0
+  );
+
+  puts( "*** END OF POSIX TIME TEST PSXTMMUTEX04 ***" );
+
+  rtems_test_exit( 0 );
+  return NULL;
+}
+
+void *Middle(
+  void *argument
+)
+{
+  int status;
+
+  /*
+   * Now we have finished the thread startup overhead,
+   * so let other threads run.  When we return, we can
+   * finish the benchmark.
+   */
+  sched_yield();
+    /* let other threads run */
+
+  status = pthread_mutex_lock( &MutexId);
+  rtems_test_assert( !status );  /*this is important*/
+
+  return NULL;
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+  int        i;
+  int        status;
+  pthread_t  threadId;
+
+  puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX04 ***" );
+
+  for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
+    status = pthread_create( &threadId, NULL, Middle, NULL );
+    rtems_test_assert( !status );
+  }
+  
+  status = pthread_create( &threadId, NULL, Low, NULL );
+  rtems_test_assert( !status );
+
+  /*
+   * Deliberately create the mutex after the threads.  This way if the
+   * threads do run before we intend, they will get an error.
+   */
+  status = pthread_mutex_init( &MutexId, NULL );
+  rtems_test_assert( !status );
+
+  /*
+   * Let the other threads start so the thread startup overhead,
+   * is accounted for.  When we return, we can start the benchmark.
+   */
+  sched_yield();
+    /* let other threads run */
+
+  /* start the timer and switch through all the other tasks */
+  benchmark_timer_initialize();
+  status = pthread_mutex_timedlock( &MutexId, 0 );
+  rtems_test_assert( !status );
+
+  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/psxtmmutex04/psxtmmutex04.doc b/testsuites/psxtmtests/psxtmmutex04/psxtmmutex04.doc
new file mode 100644
index 0000000000..e5ed8ef6be
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmmutex04/psxtmmutex04.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_timedlock - not available, block