change log for rtems (2011-07-20)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Jul 20 22:12:02 UTC 2011
*joel*:
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
* psxtmmutex05/init.c: Fix test. Pattern was wrong.
M 1.24 testsuites/psxtmtests/ChangeLog
M 1.2 testsuites/psxtmtests/psxtmmutex05/init.c
diff -u rtems/testsuites/psxtmtests/ChangeLog:1.23 rtems/testsuites/psxtmtests/ChangeLog:1.24
--- rtems/testsuites/psxtmtests/ChangeLog:1.23 Wed Jul 20 15:46:48 2011
+++ rtems/testsuites/psxtmtests/ChangeLog Wed Jul 20 16:30:01 2011
@@ -1,5 +1,9 @@
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
+ * psxtmmutex05/init.c: Fix test. Pattern was wrong.
+
+2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
+
* Makefile.am, configure.ac: Add benchmark of pthread_mutex_unlock
where it is unblocking threads without preemption.
* psxtmmutex05/.cvsignore, psxtmmutex05/Makefile.am,
diff -u rtems/testsuites/psxtmtests/psxtmmutex05/init.c:1.1 rtems/testsuites/psxtmtests/psxtmmutex05/init.c:1.2
--- rtems/testsuites/psxtmtests/psxtmmutex05/init.c:1.1 Wed Jul 20 15:46:48 2011
+++ rtems/testsuites/psxtmtests/psxtmmutex05/init.c Wed Jul 20 16:30:02 2011
@@ -23,22 +23,13 @@
pthread_mutex_t MutexId;
-void *Blockers(
+void *Blocker(
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 */
-
- status = pthread_mutex_lock( &MutexId );
- rtems_test_assert( status == 0 );
+ (void) pthread_mutex_lock( &MutexId );
+ /* should never return */
+ rtems_test_assert( FALSE );
return NULL;
}
@@ -47,17 +38,14 @@
void *argument
)
{
- int i;
int status;
pthread_t threadId;
long end_time;
puts( "\n\n*** POSIX TIME TEST MUTEX 05 ***" );
- for ( i=0 ; i < OPERATION_COUNT ; i++ ) {
- status = pthread_create( &threadId, NULL, Blockers, NULL );
- rtems_test_assert( status == 0 );
- }
+ status = pthread_create( &threadId, NULL, Blocker, NULL );
+ rtems_test_assert( status == 0 );
/*
* Deliberately create the mutex after the threads. This way if the
@@ -73,11 +61,11 @@
rtems_test_assert( status == 0 );
/*
- * Let the other threads start so the thread startup overhead,
+ * 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 threads run */
+ /* let other thread run */
benchmark_timer_initialize();
status = pthread_mutex_unlock( &MutexId );
@@ -87,7 +75,7 @@
put_time(
"pthread_mutex_unlock (no preemption)",
end_time,
- OPERATION_COUNT,
+ 1,
0,
0
);
@@ -103,7 +91,7 @@
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_POSIX_THREADS OPERATION_COUNT + 1
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 2
#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 1
#define CONFIGURE_POSIX_INIT_THREAD_TABLE
*joel*:
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
* Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
pthread_mutex_unlock where it is unblocking threads with preemption.
* psxtmmutex06/.cvsignore, psxtmmutex06/Makefile.am,
psxtmmutex06/init.c, psxtmmutex06/psxtmmutex06.doc: New files.
M 1.25 testsuites/psxtmtests/ChangeLog
M 1.11 testsuites/psxtmtests/Makefile.am
M 1.14 testsuites/psxtmtests/configure.ac
A 1.1 testsuites/psxtmtests/psxtmmutex06/.cvsignore
A 1.1 testsuites/psxtmtests/psxtmmutex06/Makefile.am
A 1.1 testsuites/psxtmtests/psxtmmutex06/init.c
A 1.1 testsuites/psxtmtests/psxtmmutex06/psxtmmutex06.doc
M 1.14 testsuites/psxtmtests/psxtmtests_plan.csv
diff -u rtems/testsuites/psxtmtests/ChangeLog:1.24 rtems/testsuites/psxtmtests/ChangeLog:1.25
--- rtems/testsuites/psxtmtests/ChangeLog:1.24 Wed Jul 20 16:30:01 2011
+++ rtems/testsuites/psxtmtests/ChangeLog Wed Jul 20 16:39:25 2011
@@ -1,5 +1,12 @@
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
+ * Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of
+ pthread_mutex_unlock where it is unblocking threads with preemption.
+ * psxtmmutex06/.cvsignore, psxtmmutex06/Makefile.am,
+ psxtmmutex06/init.c, psxtmmutex06/psxtmmutex06.doc: New files.
+
+2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
+
* psxtmmutex05/init.c: Fix test. Pattern was wrong.
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
diff -u rtems/testsuites/psxtmtests/Makefile.am:1.10 rtems/testsuites/psxtmtests/Makefile.am:1.11
--- rtems/testsuites/psxtmtests/Makefile.am:1.10 Wed Jul 20 15:46:48 2011
+++ rtems/testsuites/psxtmtests/Makefile.am Wed Jul 20 16:39:25 2011
@@ -13,6 +13,7 @@
SUBDIRS += psxtmmutex02
SUBDIRS += psxtmmutex03
SUBDIRS += psxtmmutex05
+SUBDIRS += psxtmmutex06
SUBDIRS += psxtmmutex07
SUBDIRS += psxtmnanosleep01
SUBDIRS += psxtmnanosleep02
diff -u rtems/testsuites/psxtmtests/configure.ac:1.13 rtems/testsuites/psxtmtests/configure.ac:1.14
--- rtems/testsuites/psxtmtests/configure.ac:1.13 Wed Jul 20 15:46:48 2011
+++ rtems/testsuites/psxtmtests/configure.ac Wed Jul 20 16:39:25 2011
@@ -85,6 +85,7 @@
psxtmmutex02/Makefile
psxtmmutex03/Makefile
psxtmmutex05/Makefile
+psxtmmutex06/Makefile
psxtmmutex07/Makefile
psxtmnanosleep01/Makefile
psxtmnanosleep02/Makefile
diff -u /dev/null rtems/testsuites/psxtmtests/psxtmmutex06/.cvsignore:1.1
--- /dev/null Wed Jul 20 17:12:02 2011
+++ rtems/testsuites/psxtmtests/psxtmmutex06/.cvsignore Wed Jul 20 16:39:25 2011
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff -u /dev/null rtems/testsuites/psxtmtests/psxtmmutex06/Makefile.am:1.1
--- /dev/null Wed Jul 20 17:12:02 2011
+++ rtems/testsuites/psxtmtests/psxtmmutex06/Makefile.am Wed Jul 20 16:39:25 2011
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = psxtmmutex06
+psxtmmutex06_SOURCES = init.c ../../tmtests/include/timesys.h \
+ ../../support/src/tmtests_empty_function.c \
+ ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = psxtmmutex06.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .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 = $(psxtmmutex06_OBJECTS) $(psxtmmutex06_LDADD)
+LINK_LIBS = $(psxtmmutex06_LDLIBS)
+
+psxtmmutex06$(EXEEXT): $(psxtmmutex06_OBJECTS) $(psxtmmutex06_DEPENDENCIES)
+ @rm -f psxtmmutex06$(EXEEXT)
+ $(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff -u /dev/null rtems/testsuites/psxtmtests/psxtmmutex06/init.c:1.1
--- /dev/null Wed Jul 20 17:12:02 2011
+++ rtems/testsuites/psxtmtests/psxtmmutex06/init.c Wed Jul 20 16:39:25 2011
@@ -0,0 +1,154 @@
+/*
+ * 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 <tmacros.h>
+#include <timesys.h>
+#include "test_support.h"
+#include <pthread.h>
+#include <sched.h>
+#include <rtems/timerdrv.h>
+
+pthread_mutex_t MutexId;
+
+void *Low(
+ void *argument
+)
+{
+ int status;
+ uint32_t end_time;
+
+ status = pthread_mutex_lock( &MutexId );
+ end_time = benchmark_timer_read();
+
+ rtems_test_assert( status == 0 );
+
+ put_time(
+ "pthread_mutex_unlock (unblocking, prempt)",
+ end_time,
+ OPERATION_COUNT,
+ 0,
+ 0
+ );
+
+ puts( "*** END OF POSIX TIME TEST MUTEX 07 ***" );
+ rtems_test_exit( 0 );
+ return NULL;
+}
+
+void *Middle(
+ void *argument
+)
+{
+ int status;
+
+ status = pthread_mutex_lock( &MutexId );
+ rtems_test_assert( status == 0 );
+
+ /* thread switch occurs */
+
+ status = pthread_mutex_unlock( &MutexId );
+ rtems_test_assert( status == 0 );
+
+ /* thread switch occurs */
+
+ return NULL;
+}
+
+void *POSIX_Init(
+ void *argument
+)
+{
+ int i;
+ int status;
+ pthread_t threadId;
+ pthread_attr_t attr;
+ struct sched_param param;
+
+ puts( "\n\n*** POSIX TIME TEST MUTEX 02 ***" );
+
+ /*
+ * Deliberately create the mutex BEFORE the threads. This way the
+ * threads should preempt this thread and block as they are created.
+ */
+ status = pthread_mutex_init( &MutexId, NULL );
+ rtems_test_assert( status == 0 );
+
+ /*
+ * Lock the mutex so the threads will block.
+ */
+ status = pthread_mutex_lock( &MutexId );
+ rtems_test_assert( status == 0 );
+
+ /*
+ * Now lower our priority
+ */
+ status = pthread_attr_init( &attr );
+ rtems_test_assert( status == 0 );
+
+ status = pthread_attr_setinheritsched( &attr, PTHREAD_EXPLICIT_SCHED );
+ rtems_test_assert( status == 0 );
+
+ status = pthread_attr_setschedpolicy( &attr, SCHED_RR );
+ rtems_test_assert( status == 0 );
+
+ param.sched_priority = 2;
+ status = pthread_attr_setschedparam( &attr, ¶m );
+ rtems_test_assert( status == 0 );
+
+ /*
+ * And create rest of threads as more important than we are. They
+ * will preempt us as they are created and block.
+ */
+ for ( i=0 ; i < OPERATION_COUNT ; i++ ) {
+
+ param.sched_priority = 3 + i;
+ status = pthread_attr_setschedparam( &attr, ¶m );
+ rtems_test_assert( status == 0 );
+
+ status = pthread_create(
+ &threadId,
+ &attr,
+ (i == OPERATION_COUNT - 1) ? Low : Middle,
+ NULL
+ );
+ rtems_test_assert( status == 0 );
+ }
+
+ /*
+ * Now start the timer which will be stopped in Low
+ */
+ benchmark_timer_initialize();
+
+ status = pthread_mutex_unlock( &MutexId );
+ rtems_test_assert( status == 0 );
+
+ /* thread switch occurs */
+ 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_MUTEXES 1
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+ /* end of file */
diff -u /dev/null rtems/testsuites/psxtmtests/psxtmmutex06/psxtmmutex06.doc:1.1
--- /dev/null Wed Jul 20 17:12:02 2011
+++ rtems/testsuites/psxtmtests/psxtmmutex06/psxtmmutex06.doc Wed Jul 20 16:39:25 2011
@@ -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_mutex_unlock - thread waiting, preempt
diff -u rtems/testsuites/psxtmtests/psxtmtests_plan.csv:1.13 rtems/testsuites/psxtmtests/psxtmtests_plan.csv:1.14
--- rtems/testsuites/psxtmtests/psxtmtests_plan.csv:1.13 Wed Jul 20 08:20:24 2011
+++ rtems/testsuites/psxtmtests/psxtmtests_plan.csv Wed Jul 20 16:39:25 2011
@@ -6,8 +6,8 @@
"pthread_mutex_trylock - available","psxtmmutex03","psxtmtest_single","Yes"
"pthread_mutex_trylock - not available","psxtmmutex03","psxtmtest_single","Yes"
"pthread_mutex_unlock - no threads waiting","psxtmmutex03","psxtmtest_single","Yes"
-"pthread_mutex_unlock - thread waiting, no preempt","psxtmmutex05","psxtmtest_unblocking_nopreempt",
-"pthread_mutex_unlock - thread waiting, preempt","psxtmmutex06","psxtmtest_unblocking_preempt",
+"pthread_mutex_unlock - thread waiting, no preempt","psxtmmutex05","psxtmtest_unblocking_nopreempt","Yes"
+"pthread_mutex_unlock - thread waiting, preempt","psxtmmutex06","psxtmtest_unblocking_preempt","Yes"
"pthread_mutex_timedlock - available","psxtmmutex03","psxtmtest_single","Yes"
"pthread_mutex_timedlock - not available, block","psxtmmutex04","psxtmtest_blocking","Yes"
"pthread_mutex_setprioceiling","psxtmmutex07","psxtmtest_single","Yes"
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110720/c8e67338/attachment-0001.html>
More information about the vc
mailing list