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

	PR 1852/tests
	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	sem_wait - not available, block.
	* psxtmsem03/.cvsignore, psxtmsem03/Makefile.am, psxtmsem03/init.c,
	psxtmsem03/psxtmsem03.doc: New files.

8 files changed, 181 insertions, 1 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index d6b40343f4..eb083d3f39 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,5 +1,13 @@
 2011-07-26	Ricardo Aguirre <el.mastin@ymail.com>
 
+	PR 1852/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	sem_wait - not available, block.
+	* psxtmsem03/.cvsignore, psxtmsem03/Makefile.am, psxtmsem03/init.c,
+	psxtmsem03/psxtmsem03.doc: New files.
+
+2011-07-26	Ricardo Aguirre <el.mastin@ymail.com>
+
 	PR 1850/tests
 	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
 	sem_post - thread waiting, preempt.
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 656d5158db..7723af9408 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -20,6 +20,7 @@ SUBDIRS += psxtmnanosleep01
 SUBDIRS += psxtmnanosleep02
 SUBDIRS += psxtmsem01
 SUBDIRS += psxtmsem02
+SUBDIRS += psxtmsem03
 SUBDIRS += psxtmsem04
 SUBDIRS += psxtmsem05
 SUBDIRS += psxtmsleep01
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index fabcf7295e..78ea6d7794 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -92,6 +92,7 @@ psxtmnanosleep01/Makefile
 psxtmnanosleep02/Makefile
 psxtmsem01/Makefile
 psxtmsem02/Makefile
+psxtmsem03/Makefile
 psxtmsem04/Makefile
 psxtmsem05/Makefile
 psxtmsleep01/Makefile
diff --git a/testsuites/psxtmtests/psxtmsem03/.cvsignore b/testsuites/psxtmtests/psxtmsem03/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmsem03/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmsem03/Makefile.am b/testsuites/psxtmtests/psxtmsem03/Makefile.am
new file mode 100644
index 0000000000..aa8603ae79
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmsem03/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmsem03
+psxtmsem03_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmsem03.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 = $(psxtmsem03_OBJECTS) $(psxtmsem03_LDADD)
+LINK_LIBS = $(psxtmsem03_LDLIBS)
+
+psxtmsem03$(EXEEXT): $(psxtmsem03_OBJECTS) $(psxtmsem03_DEPENDENCIES)
+	@rm -f psxtmsem03$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c
new file mode 100644
index 0000000000..20a3fa6a77
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmsem03/init.c
@@ -0,0 +1,124 @@
+/*
+ *  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$
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <semaphore.h>
+#include <tmacros.h>
+#include <timesys.h>
+#include <rtems/timerdrv.h>
+#include "test_support.h"
+#include <pthread.h>
+#include <sched.h>
+
+#define MAX_SEMS  2
+
+sem_t  sem1;
+
+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(
+    "sem_wait - not available, block",
+    end_time,
+    OPERATION_COUNT,
+    0,
+    0
+  );
+
+  puts( "*** END OF POSIX TIME TEST PSXTMSEM03 ***" );
+
+  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) sem_wait( &sem1 );
+    rtems_test_assert( FALSE );
+  return NULL;
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+  int        i;
+  int        status;
+  pthread_t  threadId;
+
+  puts( "\n\n*** POSIX TIME TEST PSXTMSEM03 ***" );
+
+  for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
+    status = pthread_create( &threadId, NULL, Middle, NULL );
+    rtems_test_assert( status == 0 );
+  }
+  
+  status = pthread_create( &threadId, NULL, Low, NULL );
+  rtems_test_assert( status == 0 );
+
+  /*
+   * Deliberately create the semaphore after the threads.  This way if the
+   * threads do run before we intend, they will get an error.
+   */
+    status = sem_init( &sem1, 0, 1 );
+  rtems_test_assert( status == 0 );
+
+  /*
+   * 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 = sem_wait(&sem1);
+  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_SEMAPHORES  MAX_SEMS
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+  /* end of file */
diff --git a/testsuites/psxtmtests/psxtmsem03/psxtmsem03.doc b/testsuites/psxtmtests/psxtmsem03/psxtmsem03.doc
new file mode 100644
index 0000000000..231e4c79b5
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmsem03/psxtmsem03.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:
+
++ sem_wait - not available, block
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index a79ec90ac7..accb08b298 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -107,7 +107,7 @@
 "sem_close (named second close - removes)","psxtmsem01","psxtmtest_single","Yes"
 "sem_unlink (deletes)","psxtmsem01","psxtmtest_single","Yes"
 "sem_wait - available","psxtmsem02","psxtmtest_single","Yes"
-"sem_wait - not available, block",,"psxtmtest_blocking",
+"sem_wait - not available, block","psxtmsem03","psxtmtest_blocking","Yes"
 "sem_trywait - available","psxtmsem02","psxtmtest_single","Yes"
 "sem_trywait - not available","psxtmsem02","psxtmtest_single","Yes"
 "sem_post - no threads waiting","psxtmsem02","psxtmtest_single","Yes"