<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-08-04)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-08-04 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxtmrwlock03/init.c: Fix abstime issue. Time is now reasonable.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/ChangeLog.diff?r1=text&tr1=1.41&r2=text&tr2=1.42&diff_format=h">M</a></td><td width='1%'>1.42</td><td width='100%'>testsuites/psxtmtests/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/psxtmrwlock03/init.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>testsuites/psxtmtests/psxtmrwlock03/init.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/testsuites/psxtmtests/ChangeLog:1.41 rtems/testsuites/psxtmtests/ChangeLog:1.42
--- rtems/testsuites/psxtmtests/ChangeLog:1.41 Tue Aug 2 12:20:18 2011
+++ rtems/testsuites/psxtmtests/ChangeLog Thu Aug 4 09:42:05 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-08-04 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * psxtmrwlock03/init.c: Fix abstime issue. Time is now reasonable.
+
</font> 2011-08-02 Ricardo Aguirre <el.mastin@ymail.com>
PR 1880/tests
<font color='#006600'>diff -u rtems/testsuites/psxtmtests/psxtmrwlock03/init.c:1.1 rtems/testsuites/psxtmtests/psxtmrwlock03/init.c:1.2
--- rtems/testsuites/psxtmtests/psxtmrwlock03/init.c:1.1 Tue Aug 2 10:17:17 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock03/init.c Thu Aug 4 09:42:05 2011
</font><font color='#997700'>@@ -22,6 +22,7 @@
</font> #include "test_support.h"
pthread_rwlock_t rwlock;
<font color='#000088'>+struct timespec abstime;
</font>
void *Low(
void *argument
<font color='#997700'>@@ -58,10 +59,6 @@
</font> )
{
int status;
<font color='#880000'>- struct timespec abstime;
-
- abstime.tv_sec = 0;
- abstime.tv_nsec = 0;
</font>
/*
* Now we have finished the thread startup overhead,
<font color='#997700'>@@ -74,9 +71,7 @@
</font> /* this timed read lock operation will be blocked
* cause a write operation has the lock */
status = pthread_rwlock_timedrdlock(&rwlock, &abstime);
<font color='#880000'>- /*status should be non zero, cause read lock is refused...
- * blocked during abstime */
- rtems_test_assert( status == ETIMEDOUT );
</font><font color='#000088'>+ rtems_test_assert( status == 0 );
</font> return NULL;
}
<font color='#997700'>@@ -100,6 +95,13 @@
</font> rtems_test_assert( !status );
/*
<font color='#000088'>+ * Timeout for 5 seconds from now.
+ */
+ status = clock_gettime( CLOCK_REALTIME, &abstime );
+ rtems_test_assert( !status );
+ abstime.tv_sec += 5;
+
+ /*
</font> * Deliberately create the rwlock after the threads. This way if the
* threads do run before we intend, they will get an error.
*/
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-08-04 Ricardo Aguirre <el.mastin@ymail.com>
PR 1881/tests
* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
pthread_rwlock_timedwrlock - not available, blocks.
* psxtmrwlock05/.cvsignore, psxtmrwlock05/Makefile.am,
psxtmrwlock05/init.c, psxtmrwlock05/psxtmrwlock05.doc: New files.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/ChangeLog.diff?r1=text&tr1=1.42&r2=text&tr2=1.43&diff_format=h">M</a></td><td width='1%'>1.43</td><td width='100%'>testsuites/psxtmtests/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/Makefile.am.diff?r1=text&tr1=1.24&r2=text&tr2=1.25&diff_format=h">M</a></td><td width='1%'>1.25</td><td width='100%'>testsuites/psxtmtests/Makefile.am</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/configure.ac.diff?r1=text&tr1=1.27&r2=text&tr2=1.28&diff_format=h">M</a></td><td width='1%'>1.28</td><td width='100%'>testsuites/psxtmtests/configure.ac</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/psxtmrwlock05/.cvsignore?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">testsuites/psxtmtests/psxtmrwlock05/.cvsignore</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/psxtmrwlock05/Makefile.am?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">testsuites/psxtmtests/psxtmrwlock05/Makefile.am</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/psxtmrwlock05/init.c?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">testsuites/psxtmtests/psxtmrwlock05/init.c</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.doc?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.doc</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/psxtmtests_plan.csv.diff?r1=text&tr1=1.26&r2=text&tr2=1.27&diff_format=h">M</a></td><td width='1%'>1.27</td><td width='100%'>testsuites/psxtmtests/psxtmtests_plan.csv</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/testsuites/psxtmtests/ChangeLog:1.42 rtems/testsuites/psxtmtests/ChangeLog:1.43
--- rtems/testsuites/psxtmtests/ChangeLog:1.42 Thu Aug 4 09:42:05 2011
+++ rtems/testsuites/psxtmtests/ChangeLog Thu Aug 4 10:02:06 2011
</font><font color='#997700'>@@ -1,3 +1,11 @@
</font><font color='#000088'>+2011-08-04 Ricardo Aguirre <el.mastin@ymail.com>
+
+ PR 1881/tests
+ * Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+ pthread_rwlock_timedwrlock - not available, blocks.
+ * psxtmrwlock05/.cvsignore, psxtmrwlock05/Makefile.am,
+ psxtmrwlock05/init.c, psxtmrwlock05/psxtmrwlock05.doc: New files.
+
</font> 2011-08-04 Joel Sherrill <joel.sherrill@oarcorp.com>
* psxtmrwlock03/init.c: Fix abstime issue. Time is now reasonable.
<font color='#006600'>diff -u rtems/testsuites/psxtmtests/Makefile.am:1.24 rtems/testsuites/psxtmtests/Makefile.am:1.25
--- rtems/testsuites/psxtmtests/Makefile.am:1.24 Tue Aug 2 12:20:18 2011
+++ rtems/testsuites/psxtmtests/Makefile.am Thu Aug 4 10:02:06 2011
</font><font color='#997700'>@@ -25,6 +25,7 @@
</font> SUBDIRS += psxtmrwlock02
SUBDIRS += psxtmrwlock03
SUBDIRS += psxtmrwlock04
<font color='#000088'>+SUBDIRS += psxtmrwlock05
</font> SUBDIRS += psxtmsem01
SUBDIRS += psxtmsem02
SUBDIRS += psxtmsem03
<font color='#006600'>diff -u rtems/testsuites/psxtmtests/configure.ac:1.27 rtems/testsuites/psxtmtests/configure.ac:1.28
--- rtems/testsuites/psxtmtests/configure.ac:1.27 Tue Aug 2 12:20:18 2011
+++ rtems/testsuites/psxtmtests/configure.ac Thu Aug 4 10:02:06 2011
</font><font color='#997700'>@@ -97,6 +97,7 @@
</font> psxtmrwlock02/Makefile
psxtmrwlock03/Makefile
psxtmrwlock04/Makefile
<font color='#000088'>+psxtmrwlock05/Makefile
</font> psxtmsem01/Makefile
psxtmsem02/Makefile
psxtmsem03/Makefile
<font color='#006600'>diff -u /dev/null rtems/testsuites/psxtmtests/psxtmrwlock05/.cvsignore:1.1
--- /dev/null Thu Aug 4 10:10:18 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock05/.cvsignore Thu Aug 4 10:02:06 2011
</font><font color='#997700'>@@ -0,0 +1,2 @@
</font><font color='#000088'>+Makefile
+Makefile.in
</font>
<font color='#006600'>diff -u /dev/null rtems/testsuites/psxtmtests/psxtmrwlock05/Makefile.am:1.1
--- /dev/null Thu Aug 4 10:10:18 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock05/Makefile.am Thu Aug 4 10:02:06 2011
</font><font color='#997700'>@@ -0,0 +1,30 @@
</font><font color='#000088'>+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmrwlock05
+psxtmrwlock05_SOURCES = init.c ../../tmtests/include/timesys.h \
+ ../../support/src/tmtests_empty_function.c \
+ ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmrwlock05.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 = $(psxtmrwlock05_OBJECTS) $(psxtmrwlock05_LDADD)
+LINK_LIBS = $(psxtmrwlock05_LDLIBS)
+
+psxtmrwlock05$(EXEEXT): $(psxtmrwlock05_OBJECTS) $(psxtmrwlock05_DEPENDENCIES)
+ @rm -f psxtmrwlock05$(EXEEXT)
+ $(make-exe)
+
+include $(top_srcdir)/../automake/local.am
</font>
<font color='#006600'>diff -u /dev/null rtems/testsuites/psxtmtests/psxtmrwlock05/init.c:1.1
--- /dev/null Thu Aug 4 10:10:19 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock05/init.c Thu Aug 4 10:02:06 2011
</font><font color='#997700'>@@ -0,0 +1,143 @@
</font><font color='#000088'>+/*
+ * 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 <sched.h>
+#include <pthread.h>
+#include <rtems/timerdrv.h>
+#include "test_support.h"
+
+pthread_rwlock_t rwlock;
+struct timespec abstime;
+
+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_timedwrlock - not available, blocks",
+ end_time,
+ OPERATION_COUNT,
+ 0,
+ 0
+ );
+
+ puts( "*** END OF POSIX TIME PSXTMRWLOCK 05 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 timed write lock operation will be blocked<span style="background-color: #FF0000"> </span>
+ * because the other write operation has the lock
+ */
+ status = pthread_rwlock_timedwrlock(&rwlock, &abstime);
+ 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 05 TEST ***" );
+
+ for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) {
+ status = pthread_create( &threadId, NULL, Middle, NULL );
+ rtems_test_assert( !status );
+ }
+<span style="background-color: #FF0000"> </span>
+ status = pthread_create( &threadId, NULL, Low, NULL );
+ rtems_test_assert( !status );
+
+ /*
+ * Timeout for 5 seconds from now.
+ */
+ status = clock_gettime( CLOCK_REALTIME, &abstime );
+ rtems_test_assert( !status );
+ abstime.tv_sec += 5;
+
+ /*
+ * 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 */
+
+<span style="background-color: #FF0000"> </span>
+ /* start the timer and switch through all the other tasks */
+ benchmark_timer_initialize();
+
+ /* write lock operation, this could be any write lock
+ * I decided to use timedwrlock just to continue in the timed line */
+ status = pthread_rwlock_timedwrlock(&rwlock,0);
+ 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 */
</font>
<font color='#006600'>diff -u /dev/null rtems/testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.doc:1.1
--- /dev/null Thu Aug 4 10:10:19 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock05/psxtmrwlock05.doc Thu Aug 4 10:02:06 2011
</font><font color='#997700'>@@ -0,0 +1,14 @@
</font><font color='#000088'>+#
+# $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_timedwrlock - not available, blocks
</font>
<font color='#006600'>diff -u rtems/testsuites/psxtmtests/psxtmtests_plan.csv:1.26 rtems/testsuites/psxtmtests/psxtmtests_plan.csv:1.27
--- rtems/testsuites/psxtmtests/psxtmtests_plan.csv:1.26 Tue Aug 2 12:20:18 2011
+++ rtems/testsuites/psxtmtests/psxtmtests_plan.csv Thu Aug 4 10:02:06 2011
</font><font color='#997700'>@@ -79,7 +79,7 @@
</font> "pthread_rwlock_trywrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
"pthread_rwlock_trywrlock - not available",,"psxtmtest_single",
"pthread_rwlock_timedwrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
<font color='#880000'>-"pthread_rwlock_timedwrlock - not available, blocks",,"psxtmtest_blocking",
</font><font color='#000088'>+"pthread_rwlock_timedwrlock - not available, blocks","psxtmrwlock05","psxtmtest_blocking","Yes"
</font> ,,,
"mq_open (first open)","psxtmmq01","psxtmtest_init_destroy",
"mq_close (close of first)","psxtmmq01","psxtmtest_init_destroy",
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-08-04 Ricardo Aguirre <el.mastin@ymail.com>
* psxtmrwlock01/init.c, psxtmrwlock01/psxtmrwlock01.doc: Update.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/ChangeLog.diff?r1=text&tr1=1.43&r2=text&tr2=1.44&diff_format=h">M</a></td><td width='1%'>1.44</td><td width='100%'>testsuites/psxtmtests/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/psxtmrwlock01/init.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>testsuites/psxtmtests/psxtmrwlock01/init.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/testsuites/psxtmtests/ChangeLog:1.43 rtems/testsuites/psxtmtests/ChangeLog:1.44
--- rtems/testsuites/psxtmtests/ChangeLog:1.43 Thu Aug 4 10:02:06 2011
+++ rtems/testsuites/psxtmtests/ChangeLog Thu Aug 4 10:06:45 2011
</font><font color='#997700'>@@ -1,5 +1,9 @@
</font> 2011-08-04 Ricardo Aguirre <el.mastin@ymail.com>
<font color='#000088'>+ * psxtmrwlock01/init.c, psxtmrwlock01/psxtmrwlock01.doc: Update.
+
+2011-08-04 Ricardo Aguirre <el.mastin@ymail.com>
+
</font> PR 1881/tests
* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
pthread_rwlock_timedwrlock - not available, blocks.
<font color='#006600'>diff -u rtems/testsuites/psxtmtests/psxtmrwlock01/init.c:1.1 rtems/testsuites/psxtmtests/psxtmrwlock01/init.c:1.2
--- rtems/testsuites/psxtmtests/psxtmrwlock01/init.c:1.1 Tue Aug 2 08:23:33 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock01/init.c Thu Aug 4 10:06:45 2011
</font><font color='#997700'>@@ -12,7 +12,6 @@
</font> #ifdef HAVE_CONFIG_H
#include "config.h"
#endif
<font color='#880000'>-
</font> #include <errno.h>
#include <timesys.h>
#include <rtems/timerdrv.h>
<font color='#997700'>@@ -40,6 +39,7 @@
</font> 0,
0
);
<font color='#000088'>+
</font> }
void benchmark_pthread_rwlock_rdlock(void)
<font color='#997700'>@@ -59,9 +59,10 @@
</font> 0,
0
);
<font color='#000088'>+
</font> }
<font color='#880000'>-void benchmark_pthread_rwlock_unlock(bool do_print)
</font><font color='#000088'>+void benchmark_pthread_rwlock_unlock(int print)
</font> {
long end_time;
int status;
<font color='#997700'>@@ -69,12 +70,8 @@
</font> benchmark_timer_initialize();
status = pthread_rwlock_unlock(&rwlock);
end_time = benchmark_timer_read();
<font color='#880000'>- if ( status == EPERM )
- puts( "The current thread does not own the read-write lock");
- else
- rtems_test_assert( status == 0 );
-
- if ( do_print ) {
</font><font color='#000088'>+ rtems_test_assert( status == 0 );
+ if ( print == 1 ){
</font> put_time(
"pthread_rwlock_unlock - available",
end_time,
<font color='#997700'>@@ -93,15 +90,24 @@
</font> benchmark_timer_initialize();
status = pthread_rwlock_tryrdlock(&rwlock);
end_time = benchmark_timer_read();
<font color='#880000'>- rtems_test_assert( status == 0 );
-
- put_time(
- "pthread_rwlock_tryrdlock - available",
- end_time,
- 1, /* Only executed once */
- 0,
- 0
- );
</font><font color='#000088'>+ rtems_test_assert( status == 0 || status == EBUSY );
+ if (status == EBUSY) {
+ put_time(
+ "pthread_rwlock_tryrdlock - not available",
+ end_time,
+ 1, /* Only executed once */
+ 0,
+ 0
+ );
+ } else if (status == 0) {
+ put_time(
+ "pthread_rwlock_tryrdlock - available",
+ end_time,
+ 1, /* Only executed once */
+ 0,
+ 0
+ );
+ }
</font> }
void benchmark_pthread_rwlock_timedrdlock(void)
<font color='#997700'>@@ -121,6 +127,7 @@
</font> 0,
0
);
<font color='#000088'>+
</font> }
void benchmark_pthread_rwlock_wrlock(void)
<font color='#997700'>@@ -140,6 +147,7 @@
</font> 0,
0
);
<font color='#000088'>+
</font> }
void benchmark_pthread_rwlock_trywrlock(void)
<font color='#997700'>@@ -150,15 +158,25 @@
</font> benchmark_timer_initialize();
status = pthread_rwlock_trywrlock(&rwlock);
end_time = benchmark_timer_read();
<font color='#880000'>- rtems_test_assert( status == 0 );
</font>
<font color='#880000'>- put_time(
- "pthread_rwlock_trywrlock - available",
- end_time,
- 1, /* Only executed once */
- 0,
- 0
- );
</font><font color='#000088'>+ rtems_test_assert( status == 0 || status == EBUSY );
+ if ( status == EBUSY ) {
+ put_time(
+ "pthread_rwlock_trywrlock - not available ",
+ end_time,
+ 1, /* Only executed once */
+ 0,
+ 0
+ );
+ } else if ( status == 0 ) {
+ put_time(
+ "pthread_rwlock_trywrlock - available",
+ end_time,
+ 1, /* Only executed once */
+ 0,
+ 0
+ );
+ }
</font> }
void benchmark_pthread_rwlock_timedwrlock(void)
<font color='#997700'>@@ -211,31 +229,36 @@
</font> /* applying a read lock */
benchmark_pthread_rwlock_rdlock();
/* unlocking rwlock */
<font color='#880000'>- benchmark_pthread_rwlock_unlock( true );
- /* trying to apply a read lock when it is available */
</font><font color='#000088'>+ benchmark_pthread_rwlock_unlock(0);
+ /* trying to apply a read lock when it is available*/
</font> benchmark_pthread_rwlock_tryrdlock();
/* unlocking rwlock */
<font color='#880000'>- benchmark_pthread_rwlock_unlock( false );
</font><font color='#000088'>+ benchmark_pthread_rwlock_unlock(0);
</font> /* applying a timed read lock */
benchmark_pthread_rwlock_timedrdlock();
/* unlocking rwlock */
<font color='#880000'>- benchmark_pthread_rwlock_unlock( false );
</font><font color='#000088'>+ benchmark_pthread_rwlock_unlock(0);
</font> /* applying a write lock */
benchmark_pthread_rwlock_wrlock();
<font color='#000088'>+ /* trying to get read lock, when is not available*/
+ benchmark_pthread_rwlock_tryrdlock();
</font> /* unlocking rwlock */
<font color='#880000'>- benchmark_pthread_rwlock_unlock( false );
- /* trying to apply a write lock, when it is available */
</font><font color='#000088'>+ benchmark_pthread_rwlock_unlock(0);
+ /* trying to apply a write lock, when it is available*/
+ benchmark_pthread_rwlock_trywrlock();
+ /* trying to get write lock, when it is not available*/
</font> benchmark_pthread_rwlock_trywrlock();
/* unlocking rwlock */
<font color='#880000'>- benchmark_pthread_rwlock_unlock( false );
</font><font color='#000088'>+ benchmark_pthread_rwlock_unlock(0);
</font> /* applying a timed write lock */
benchmark_pthread_rwlock_timedwrlock();
/* unlocking rwlock */
<font color='#880000'>- benchmark_pthread_rwlock_unlock( false );
</font><font color='#000088'>+ benchmark_pthread_rwlock_unlock(1);
</font> /* destroying rwlock */
benchmark_pthread_rwlock_destroy();
puts( "*** END OF POSIX TIME PSXTMRWLOCK 01 ***" );
<font color='#000088'>+
</font> rtems_test_exit(0);
}
<font color='#006600'>diff -u rtems/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc:1.1 rtems/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc:1.2
--- rtems/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc:1.1 Tue Aug 2 08:23:33 2011
+++ rtems/testsuites/psxtmtests/psxtmrwlock01/psxtmrwlock01.doc Thu Aug 4 10:06:45 2011
</font><font color='#997700'>@@ -15,9 +15,10 @@
</font> + pthread_rwlock_rdlock - available<span style="background-color: #FF0000"> </span>
+ pthread_rwlock_unlock
+ pthread_rwlock_tryrdlock - available<span style="background-color: #FF0000"> </span>
<font color='#000088'>++ pthread_rwlock_tryrdlock - not available
</font> + pthread_rwlock_timedrdlock - available<span style="background-color: #FF0000"> </span>
<font color='#880000'>-+ pthread_rwlock_wrlock - available<span style="background-color: #FF0000"> </span>
-+ pthread_rwlock_trywrlock - available<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>++ pthread_rwlock_wrlock - available
++ pthread_rwlock_trywrlock - available
++ pthread_rwlock_trywrlock - not available<span style="background-color: #FF0000"> </span>
</font> + pthread_rwlock_timedwrlock - available<span style="background-color: #FF0000"> </span>
+ pthread_rwlock_destroy<span style="background-color: #FF0000"> </span>
<font color='#880000'>-
</font></pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>