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

	PR 1849/tests
	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	sem_post - thread waiting, no preempt.
	* psxtmsem04/.cvsignore, psxtmsem04/Makefile.am, psxtmsem04/init.c,
	psxtmsem04/psxtmsem04.doc: New files.

8 files changed, 175 insertions, 15 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index af188f6ded..12bf917ef1 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-26	Ricardo Aguirre <el.mastin@ymail.com>
+
+	PR 1849/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	sem_post - thread waiting, no preempt.
+	* psxtmsem04/.cvsignore, psxtmsem04/Makefile.am, psxtmsem04/init.c,
+	psxtmsem04/psxtmsem04.doc: New files.
+
 2011-07-22	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* psxtmthread03/psxtmthread03.doc: Fix.
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 2f1f01ee06..35c62cbebc 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -20,6 +20,7 @@ SUBDIRS += psxtmnanosleep01
 SUBDIRS += psxtmnanosleep02
 SUBDIRS += psxtmsem01
 SUBDIRS += psxtmsem02
+SUBDIRS += psxtmsem04
 SUBDIRS += psxtmsleep01
 SUBDIRS += psxtmsleep02
 SUBDIRS += psxtmthread01
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 4878dcddd1..e87a9d62f0 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -92,6 +92,7 @@ psxtmnanosleep01/Makefile
 psxtmnanosleep02/Makefile
 psxtmsem01/Makefile
 psxtmsem02/Makefile
+psxtmsem04/Makefile
 psxtmsleep01/Makefile
 psxtmsleep02/Makefile
 psxtmthread01/Makefile
diff --git a/testsuites/psxtmtests/psxtmsem04/.cvsignore b/testsuites/psxtmtests/psxtmsem04/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmsem04/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmsem04/Makefile.am b/testsuites/psxtmtests/psxtmsem04/Makefile.am
new file mode 100644
index 0000000000..4929299472
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmsem04/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmsem04
+psxtmsem04_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmsem04.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 = $(psxtmsem04_OBJECTS) $(psxtmsem04_LDADD)
+LINK_LIBS = $(psxtmsem04_LDLIBS)
+
+psxtmsem04$(EXEEXT): $(psxtmsem04_OBJECTS) $(psxtmsem04_DEPENDENCIES)
+	@rm -f psxtmsem04$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmsem04/init.c b/testsuites/psxtmtests/psxtmsem04/init.c
new file mode 100644
index 0000000000..cfce77c603
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmsem04/init.c
@@ -0,0 +1,104 @@
+/*
+ *  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 <errno.h>
+#include <fcntl.h>
+#include <semaphore.h>
+#include <coverhd.h>
+#include <tmacros.h>
+#include <timesys.h>
+#include "test_support.h"
+#include <pthread.h>
+#include <sched.h>
+#include <rtems/timerdrv.h>
+
+#define MAX_SEMS  2
+
+sem_t           sem1;
+sem_t           *n_sem1;
+
+void *Blocker( void *argument)
+{
+  (void) sem_wait(&sem1);
+  /* should never return */
+  rtems_test_assert( FALSE );
+
+  return NULL;
+}
+
+void *POSIX_Init(void *argument)
+{
+  int        status;
+  pthread_t  threadId;
+  long       end_time;
+
+  puts( "\n\n*** POSIX TIME TEST SEMAPHORE 04 ***" );
+
+  status = pthread_create( &threadId, NULL, Blocker, 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 );
+
+  /*
+   * Ensure the semaphore is unavailable so the other threads block.
+   * Lock semaphore resource to ensure thread blocks.
+   */
+  status = sem_wait(&sem1);
+  rtems_test_assert( status == 0 );
+
+  /*
+   * Let the other thread start so the thread startup overhead,
+   * is accounted for.  When we return, we can start the benchmark.
+   */
+  sched_yield();
+    /* let other thread run */
+
+  benchmark_timer_initialize();
+    status = sem_post( &sem1 ); /* semaphore unblocking operation */
+  end_time = benchmark_timer_read();
+  rtems_test_assert( status == 0 );
+
+  put_time(
+    "sem_post - thread waiting, no preempt",
+    end_time,
+    1,
+    0,
+    0
+  );
+
+  puts( "*** END OF POSIX TIME TEST SEMAPHORE 04 ***" );
+  rtems_test_exit( 0 );
+
+  return NULL;
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS     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/psxtmsem04/psxtmsem04.doc b/testsuites/psxtmtests/psxtmsem04/psxtmsem04.doc
new file mode 100644
index 0000000000..646a29f24c
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmsem04/psxtmsem04.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_post - thread waiting, no preempt
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index b62fdde052..15e3cc1dc1 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -27,12 +27,12 @@
 "pthread_join","psxtmthread03",,
 "pthread_detach",,,
 "pthread_exit",,,
-"pthread_self",,,
-"pthread_equal",,,
-"pthread_getschedparam",,,
-"pthread_setschedparam - no thread switch",,,
-"pthread_setschedparam - lower own priority, preempt",,,
-"pthread_setschedparam - raise other priority, preempt",,,
+"pthread_self",,"psxtmtest_single",
+"pthread_equal",,"psxtmtest_single",
+"pthread_getschedparam",,"psxtmtest_single",
+"pthread_setschedparam - no thread switch",,"psxtmtest_single",
+"pthread_setschedparam - lower own priority, preempt",,"psxtmtest_single",
+"pthread_setschedparam - raise other priority, preempt",,"psxtmtest_single",
 ,,,
 "pthread_once",,,
 ,,,
@@ -52,9 +52,9 @@
 ,,,
 "pthread_barrier_init","psxtmbarrier01","psxtmtest_init_destroy",
 "pthread_barrier_destroy","psxtmbarrier01","psxtmtest_init_destroy",
-"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",
+"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",
 ,,,
 "pthread_spin_init",,"psxtmtest_init_destroy",
 "pthread_spin_destroy",,"psxtmtest_init_destroy",
@@ -81,11 +81,11 @@
 "pthread_rwlock_timedwrlock - available",,"psxtmtest_single",
 "pthread_rwlock_timedwrlock - not available, blocks",,"psxtmtest_blocking",
 ,,,
-"mq_open (first open)","psxtmsem02","psxtmtest_init_destroy",
-"mq_close (close of first)","psxtmsem02","psxtmtest_init_destroy",
-"mq_open (second open)","psxtmsem03","psxtmtest_init_destroy",
-"mq_close (close of second)","psxtmsem03","psxtmtest_init_destroy",
-"mq_unlink",,,
+"mq_open (first open)","psxtmmq01","psxtmtest_init_destroy",
+"mq_close (close of first)","psxtmmq01","psxtmtest_init_destroy",
+"mq_open (second open)","psxtmmq01","psxtmtest_init_destroy",
+"mq_close (close of second)","psxtmmq01","psxtmtest_init_destroy",
+"mq_unlink","psxtmmq01","psxtmtest_init_destroy",
 "mq_receive - available",,"psxtmtest_single",
 "mq_receive - not available, block",,"psxtmtest_blocking",
 "mq_timedreceive - available",,"psxtmtest_single",
@@ -111,7 +111,7 @@
 "sem_trywait - available","psxtmsem02","psxtmtest_single","Yes"
 "sem_trywait - not available","psxtmsem02","psxtmtest_single","Yes"
 "sem_post - no threads waiting","psxtmsem02","psxtmtest_single","Yes"
-"sem_post - thread waiting, no preempt",,"psxtmtest_unblocking_nopreempt",
+"sem_post - thread waiting, no preempt","psxsemtm04","psxtmtest_unblocking_nopreempt","Yes"
 "sem_post - thread waiting, preempt",,"psxtmtest_unblocking_preempt",
 "sem_getvalue","psxtmsem02","psxtmtest_single","Yes"
 ,,,