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

	PR 1859/tests
	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	pthread_barrier_wait - blocking
	* psxtmbarrier02/.cvsignore, psxtmbarrier02/Makefile.am,
	psxtmbarrier02/init.c, psxtmbarrier02/psxtmbarrier02.doc: New files.

8 files changed, 194 insertions, 1 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index b5d2371fb3..a2c5ac061b 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-29	Ricardo Aguirre <el.mastin@ymail.com>
+
+	PR 1859/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	pthread_barrier_wait - blocking
+	* psxtmbarrier02/.cvsignore, psxtmbarrier02/Makefile.am,
+	psxtmbarrier02/init.c, psxtmbarrier02/psxtmbarrier02.doc: New files.
+
 2011-07-28	Ricardo Aguirre <el.mastin@ymail.com>
 
 	PR 1859/tests
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index e6d637bfa6..b37b12af0c 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -8,6 +8,7 @@ SUBDIRS =
 
 if HAS_POSIX
 SUBDIRS += psxtmbarrier01
+SUBDIRS += psxtmbarrier02
 SUBDIRS += psxtmkey01
 SUBDIRS += psxtmkey02
 SUBDIRS += psxtmmutex01
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 0d60eeb8fe..5045a60d53 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -80,6 +80,7 @@ AC_SUBST(OPERATION_COUNT)
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
 psxtmbarrier01/Makefile
+psxtmbarrier02/Makefile
 psxtmkey01/Makefile
 psxtmkey02/Makefile
 psxtmmutex01/Makefile
diff --git a/testsuites/psxtmtests/psxtmbarrier02/.cvsignore b/testsuites/psxtmtests/psxtmbarrier02/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmbarrier02/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmbarrier02/Makefile.am b/testsuites/psxtmtests/psxtmbarrier02/Makefile.am
new file mode 100644
index 0000000000..716c53976a
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmbarrier02/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmbarrier02
+psxtmbarrier02_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmbarrier02.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 = $(psxtmbarrier02_OBJECTS) $(psxtmbarrier02_LDADD)
+LINK_LIBS = $(psxtmbarrier02_LDLIBS)
+
+psxtmbarrier02$(EXEEXT): $(psxtmbarrier02_OBJECTS) $(psxtmbarrier02_DEPENDENCIES)
+	@rm -f psxtmbarrier02$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c
new file mode 100644
index 0000000000..be94311c43
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmbarrier02/init.c
@@ -0,0 +1,137 @@
+/*
+ *  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_barrier_t     barrier;
+
+void *Low(
+  void *argument
+)
+{
+  long 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_barrier_wait – blocking",
+    end_time,
+    OPERATION_COUNT,
+    0,
+    0
+  );
+
+  puts( "*** END OF POSIX TIME PSXTMBARRIER 02 ***" );
+
+  rtems_test_exit( 0 );
+  return NULL;
+}
+
+void *Middle(
+  void *argument
+)
+{
+  /*
+   * 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 */
+
+    (void) pthread_barrier_wait( &barrier );
+  
+  /* should never return */
+  rtems_test_assert( FALSE );
+  return NULL;
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+  int        i;
+  int        status;
+  pthread_t  threadId;
+  pthread_barrierattr_t attr;
+
+  puts( "\n\n*** POSIX TIME PSXTMBARRIER 02 ***" );
+
+  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 );
+
+  /*
+   * Create the barrier with default attributes and deliberately
+   * create it after the Threads so if they run too early, they
+   * wull fail with an error.
+   */
+  status = pthread_barrierattr_init( &attr );
+  rtems_test_assert( status == 0 );
+
+  /*
+   * Set threshold on count higher than number of threads so all will
+   * block.
+   */
+  status = pthread_barrier_init( &barrier,&attr, OPERATION_COUNT + 2 );
+  rtems_test_assert( status == 0 );
+
+  /*
+   * Let other threads run through their initialization
+   */
+  sched_yield();
+
+  /*
+   * Start the timer and start the blocking barrier wait chain through
+   * all the other tasks.
+   */
+  benchmark_timer_initialize();
+    /* blocking barrier call */
+    status = pthread_barrier_wait( &barrier );
+  rtems_test_assert( status == 0 );
+  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_BARRIERS    1
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+  /* end of file */
diff --git a/testsuites/psxtmtests/psxtmbarrier02/psxtmbarrier02.doc b/testsuites/psxtmtests/psxtmbarrier02/psxtmbarrier02.doc
new file mode 100644
index 0000000000..25bcacad2c
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmbarrier02/psxtmbarrier02.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_barrier_wait – blocking
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index 2a03c53930..07854266c8 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -52,7 +52,7 @@
 ,,,
 "pthread_barrier_init","psxtmbarrier01","psxtmtest_init_destroy","Yes"
 "pthread_barrier_destroy","psxtmbarrier01","psxtmtest_init_destroy","Yes"
-"pthread_barrier_wait - blocking","psxtmbarrier02","psxtmtest_blocking",
+"pthread_barrier_wait - blocking","psxtmbarrier02","psxtmtest_blocking","Yes"
 "pthread_barrier_wait - releasing, no preempt","psxtmbarrier03","psxtmtest_unblocking_nopreempt",
 "pthread_barrier_wait - releasing, preempt","psxtmbarrier04","psxtmtest_unblocking_preempt",
 ,,,