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

	PR 1859/tests
	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	pthread_barrier_init and pthread_barrier_destroy.
	* psxtmbarrier01/.cvsignore, psxtmbarrier01/Makefile.am,
	psxtmbarrier01/init.c, psxtmbarrier01/psxtmbarrier01.doc: New files.

8 files changed, 156 insertions, 3 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index eb083d3f39..b5d2371fb3 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-28	Ricardo Aguirre <el.mastin@ymail.com>
+
+	PR 1859/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	pthread_barrier_init and pthread_barrier_destroy.
+	* psxtmbarrier01/.cvsignore, psxtmbarrier01/Makefile.am,
+	psxtmbarrier01/init.c, psxtmbarrier01/psxtmbarrier01.doc: New files.
+
 2011-07-26	Ricardo Aguirre <el.mastin@ymail.com>
 
 	PR 1852/tests
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 7723af9408..e6d637bfa6 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -7,6 +7,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 SUBDIRS =
 
 if HAS_POSIX
+SUBDIRS += psxtmbarrier01
 SUBDIRS += psxtmkey01
 SUBDIRS += psxtmkey02
 SUBDIRS += psxtmmutex01
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 78ea6d7794..0d60eeb8fe 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -79,6 +79,7 @@ AC_SUBST(OPERATION_COUNT)
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile
+psxtmbarrier01/Makefile
 psxtmkey01/Makefile
 psxtmkey02/Makefile
 psxtmmutex01/Makefile
diff --git a/testsuites/psxtmtests/psxtmbarrier01/.cvsignore b/testsuites/psxtmtests/psxtmbarrier01/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmbarrier01/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmbarrier01/Makefile.am b/testsuites/psxtmtests/psxtmbarrier01/Makefile.am
new file mode 100644
index 0000000000..2ced7bcd40
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmbarrier01/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmbarrier01
+psxtmbarrier01_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmbarrier01.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 = $(psxtmbarrier01_OBJECTS) $(psxtmbarrier01_LDADD)
+LINK_LIBS = $(psxtmbarrier01_LDLIBS)
+
+psxtmbarrier01$(EXEEXT): $(psxtmbarrier01_OBJECTS) $(psxtmbarrier01_DEPENDENCIES)
+	@rm -f psxtmbarrier01$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c
new file mode 100644
index 0000000000..5deba788c6
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmbarrier01/init.c
@@ -0,0 +1,96 @@
+/*
+ *  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 "test_support.h"
+#include <pthread.h>
+
+pthread_barrier_t   barrier;
+
+void benchmark_pthread_barrier_init(void)
+{
+  long                  end_time;
+  int                   status;
+  pthread_barrierattr_t attr;
+
+  /* initialize attr with default attributes
+   * for all of the attributes defined by the implementation
+   */
+  status = pthread_barrierattr_init( &attr );
+  rtems_test_assert( status == 0 );
+
+  benchmark_timer_initialize();
+    status = pthread_barrier_init( &barrier,&attr, 1 );
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_barrier_init",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void benchmark_pthread_barrier_destroy(void)
+{
+  long end_time;
+  int  status;
+
+  benchmark_timer_initialize();
+    status = pthread_barrier_destroy( &barrier );
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "pthread_barrier_destroy",
+    end_time,
+    1,        /* Only executed once */
+    0,
+    0
+  );
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+  puts( "\n\n*** POSIX TIME TEST PSXTMBARRIER 01 ***" );
+
+  /* creating barrier with default properties */
+  benchmark_pthread_barrier_init();
+  /* destroying barrier */
+  benchmark_pthread_barrier_destroy();
+  
+  puts( "*** END OF POSIX TIME TEST PSXTMBARRIER 01  ***" );
+
+  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_BARRIERS    1
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+/* end of file */
diff --git a/testsuites/psxtmtests/psxtmbarrier01/psxtmbarrier01.doc b/testsuites/psxtmtests/psxtmbarrier01/psxtmbarrier01.doc
new file mode 100644
index 0000000000..753bc6642c
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmbarrier01/psxtmbarrier01.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_barrier_init
++ pthread_barrier_destroy
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index accb08b298..2a03c53930 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -50,8 +50,8 @@
 ,,,
 "pthread_getcpuclockid",,,
 ,,,
-"pthread_barrier_init","psxtmbarrier01","psxtmtest_init_destroy",
-"pthread_barrier_destroy","psxtmbarrier01","psxtmtest_init_destroy",
+"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 - releasing, no preempt","psxtmbarrier03","psxtmtest_unblocking_nopreempt",
 "pthread_barrier_wait - releasing, preempt","psxtmbarrier04","psxtmtest_unblocking_preempt",
@@ -112,7 +112,7 @@
 "sem_trywait - not available","psxtmsem02","psxtmtest_single","Yes"
 "sem_post - no threads waiting","psxtmsem02","psxtmtest_single","Yes"
 "sem_post - thread waiting, no preempt","psxsemtm04","psxtmtest_unblocking_nopreempt","Yes"
-"sem_post - thread waiting, preempt","psxtmsem05","psxtmtest_unblocking_preempt",
+"sem_post - thread waiting, preempt","psxtmsem05","psxtmtest_unblocking_preempt","Yes"
 "sem_getvalue","psxtmsem02","psxtmtest_single","Yes"
 ,,,
 "sleep - yield","psxtmsleep01","psxtmtest_single","Yes"