2011-08-02 Ricardo Aguirre <el.mastin@ymail.com>

	PR 1875/tests
	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
	pthread_rwlock_rdlock - not available, blocks.
	* psxtmrwlock02/.cvsignore, psxtmrwlock02/Makefile.am,
	psxtmrwlock02/init.c, psxtmrwlock02/psxtmrwlock02.doc: New files.

8 files changed, 188 insertions, 2 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index 27b26070f1..0543112bf3 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,5 +1,13 @@
 2011-08-02	Ricardo Aguirre <el.mastin@ymail.com>
 
+	PR 1875/tests
+	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+	pthread_rwlock_rdlock - not available, blocks.
+	* psxtmrwlock02/.cvsignore, psxtmrwlock02/Makefile.am,
+	psxtmrwlock02/init.c, psxtmrwlock02/psxtmrwlock02.doc: New files.
+
+2011-08-02	Ricardo Aguirre <el.mastin@ymail.com>
+
 	PR 1874/tests
 	* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
 	multiple pthread_rwlock operations that can be done as single shot
diff --git a/testsuites/psxtmtests/Makefile.am b/testsuites/psxtmtests/Makefile.am
index 0dbe59e6e4..4a0c1eadbe 100644
--- a/testsuites/psxtmtests/Makefile.am
+++ b/testsuites/psxtmtests/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS += psxtmmutex07
 SUBDIRS += psxtmnanosleep01
 SUBDIRS += psxtmnanosleep02
 SUBDIRS += psxtmrwlock01
+SUBDIRS += psxtmrwlock02
 SUBDIRS += psxtmsem01
 SUBDIRS += psxtmsem02
 SUBDIRS += psxtmsem03
diff --git a/testsuites/psxtmtests/configure.ac b/testsuites/psxtmtests/configure.ac
index 35d4600f4e..e779538f69 100644
--- a/testsuites/psxtmtests/configure.ac
+++ b/testsuites/psxtmtests/configure.ac
@@ -93,7 +93,8 @@ psxtmmutex06/Makefile
 psxtmmutex07/Makefile
 psxtmnanosleep01/Makefile
 psxtmnanosleep02/Makefile
-psxtmrwlock01//Makefile
+psxtmrwlock01/Makefile
+psxtmrwlock02/Makefile
 psxtmsem01/Makefile
 psxtmsem02/Makefile
 psxtmsem03/Makefile
diff --git a/testsuites/psxtmtests/psxtmrwlock02/.cvsignore b/testsuites/psxtmtests/psxtmrwlock02/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock02/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/testsuites/psxtmtests/psxtmrwlock02/Makefile.am b/testsuites/psxtmtests/psxtmrwlock02/Makefile.am
new file mode 100644
index 0000000000..1854be4061
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock02/Makefile.am
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmrwlock02
+psxtmrwlock02_SOURCES = init.c ../../tmtests/include/timesys.h \
+    ../../support/src/tmtests_empty_function.c \
+    ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmrwlock02.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 = $(psxtmrwlock02_OBJECTS) $(psxtmrwlock02_LDADD)
+LINK_LIBS = $(psxtmrwlock02_LDLIBS)
+
+psxtmrwlock02$(EXEEXT): $(psxtmrwlock02_OBJECTS) $(psxtmrwlock02_DEPENDENCIES)
+	@rm -f psxtmrwlock02$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtmtests/psxtmrwlock02/init.c b/testsuites/psxtmtests/psxtmrwlock02/init.c
new file mode 100644
index 0000000000..a1b8094223
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock02/init.c
@@ -0,0 +1,130 @@
+/*
+ *  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 <coverhd.h>
+#include <errno.h>
+#include <timesys.h>
+#include <tmacros.h>
+#include <pthread.h>
+#include <sched.h>
+#include <rtems/timerdrv.h>
+#include "test_support.h"
+
+pthread_rwlock_t     rwlock;
+
+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_rwlock_rdlock - not available, blocks",
+    end_time,
+    OPERATION_COUNT,
+    0,
+    0
+  );
+
+  puts( "*** END OF POSIX TIME PSXTMRWLOCK 02 TEST ***" );
+
+  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 */
+  /* this read lock operation will be blocked
+   * cause a write operation has the lock */
+    status = pthread_rwlock_rdlock(&rwlock);
+  rtems_test_assert( status == 0 );
+  return NULL;
+}
+
+void *POSIX_Init(
+  void *argument
+)
+{
+  int        i;
+  int        status;
+  pthread_t  threadId;
+  pthread_rwlockattr_t attr;
+
+  puts( "\n\n*** POSIX TIME PSXTMRWLOCK 02 TEST ***" );
+
+  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 rwlock after the threads.  This way if the
+   * threads do run before we intend, they will get an error.
+   */
+  status = pthread_rwlockattr_init( &attr );
+  rtems_test_assert( status == 0 );
+    status = pthread_rwlock_init( &rwlock, &attr );
+  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();
+  /* write lock operation */
+    status = pthread_rwlock_wrlock(&rwlock);
+  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_RWLOCKS     1
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+  /* end of file */
diff --git a/testsuites/psxtmtests/psxtmrwlock02/psxtmrwlock02.doc b/testsuites/psxtmtests/psxtmrwlock02/psxtmrwlock02.doc
new file mode 100644
index 0000000000..930b7a1e35
--- /dev/null
+++ b/testsuites/psxtmtests/psxtmrwlock02/psxtmrwlock02.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_rwlock_rdlock - not available, blocks
diff --git a/testsuites/psxtmtests/psxtmtests_plan.csv b/testsuites/psxtmtests/psxtmtests_plan.csv
index 20299869a5..f47cf79c99 100644
--- a/testsuites/psxtmtests/psxtmtests_plan.csv
+++ b/testsuites/psxtmtests/psxtmtests_plan.csv
@@ -66,7 +66,7 @@
 "pthread_rwlock_init","psxtmrwlock01","psxtmtest_init_destroy","Yes"
 "pthread_rwlock_destroy","psxtmrwlock01","psxtmtest_init_destroy","Yes"
 "pthread_rwlock_rdlock - available","psxtmrwlock01","psxtmtest_single","Yes"
-"pthread_rwlock_rdlock - not available, blocks",,"psxtmtest_blocking",
+"pthread_rwlock_rdlock - not available, blocks",,"psxtmtest_blocking","Yes"
 "pthread_rwlock_tryrdlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_tryrdlock - not available",,"psxtmtest_single",
 "pthread_rwlock_timedrdlock - available","psxtmrwlock01","psxtmtest_single","Yes"