change log for rtems-testing (2011-07-20)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Jul 20 22:10:04 UTC 2011
*joel*:
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
* psxtmtest_unblocking_nopreempt/init.c: Fix pattern.
M 1.18 rtems-test-template/ChangeLog
M 1.2 rtems-test-template/psxtmtest_unblocking_nopreempt/init.c
diff -u rtems-testing/rtems-test-template/ChangeLog:1.17 rtems-testing/rtems-test-template/ChangeLog:1.18
--- rtems-testing/rtems-test-template/ChangeLog:1.17 Wed Jul 20 15:51:46 2011
+++ rtems-testing/rtems-test-template/ChangeLog Wed Jul 20 16:29:00 2011
@@ -1,5 +1,9 @@
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
+ * psxtmtest_unblocking_nopreempt/init.c: Fix pattern.
+
+2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
+
* psxtest/init.c, psxtest_with_thread/init.c, psxtmtest_single/init.c,
smptest/init.c, sptest/init.c, sptest_operation_from_tsr/init.c,
sptest_with_task/init.c, tmtest/init.c: Switch to @TESTNUM@ for start
diff -u rtems-testing/rtems-test-template/psxtmtest_unblocking_nopreempt/init.c:1.1 rtems-testing/rtems-test-template/psxtmtest_unblocking_nopreempt/init.c:1.2
--- rtems-testing/rtems-test-template/psxtmtest_unblocking_nopreempt/init.c:1.1 Wed Jul 20 15:48:26 2011
+++ rtems-testing/rtems-test-template/psxtmtest_unblocking_nopreempt/init.c Wed Jul 20 16:29:00 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) /* XXX blocking operation goes here */
+ /* should never return */
+ rtems_test_assert( FALSE );
return NULL;
}
@@ -47,52 +38,49 @@
void *argument
)
{
- int i;
int status;
pthread_t threadId;
long end_time;
- puts( "\n\n*** POSIX TIME TEST MUTEX @TESTNUM@ ***" );
+ puts( "\n\n*** POSIX TIME TEST XXX @TESTNUM@ ***" );
- 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 XXX after the threads. This way if the
* threads do run before we intend, they will get an error.
*/
- status = 0; /* XXX create the resource */
+ status = 0; /* XXX create resource */
rtems_test_assert( status == 0 );
/*
* Ensure the mutex is unavailable so the other threads block.
*/
- status = 0; /* XXX ensure the resource is unavailable so the threads block */
+ status = 0; /* XXX lock resource to ensure thread blocks */
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 = 0; /* XXX release the resource */
+ status = 0; /* XXX unblocking operation goes here */
end_time = benchmark_timer_read();
rtems_test_assert( status == 0 );
put_time(
- "@DESC@",
+ "@DESC",
end_time,
- OPERATION_COUNT,
+ 1,
0,
0
);
- puts( "*** END OF POSIX TIME TEST MUTEX @TESTNUM@ ***" );
+ puts( "*** END OF POSIX TIME TEST XXX @TESTNUM@ ***" );
rtems_test_exit( 0 );
return NULL;
@@ -103,8 +91,8 @@
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
-#define CONFIGURE_MAXIMUM_POSIX_THREADS OPERATION_COUNT + 1
-/* XXX configure one of the resources */
+#define CONFIGURE_MAXIMUM_POSIX_THREADS 2
+/* XXX make sure you configure the resource */
#define CONFIGURE_POSIX_INIT_THREAD_TABLE
#define CONFIGURE_INIT
*joel*:
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
* psxtmtest_unblocking_preempt/Makefile.am,
psxtmtest_unblocking_preempt/TEST.doc,
psxtmtest_unblocking_preempt/init.c: New files.
M 1.19 rtems-test-template/ChangeLog
A 1.1 rtems-test-template/psxtmtest_unblocking_preempt/Makefile.am
A 1.1 rtems-test-template/psxtmtest_unblocking_preempt/TEST.doc
A 1.1 rtems-test-template/psxtmtest_unblocking_preempt/init.c
diff -u rtems-testing/rtems-test-template/ChangeLog:1.18 rtems-testing/rtems-test-template/ChangeLog:1.19
--- rtems-testing/rtems-test-template/ChangeLog:1.18 Wed Jul 20 16:29:00 2011
+++ rtems-testing/rtems-test-template/ChangeLog Wed Jul 20 16:37:56 2011
@@ -1,5 +1,11 @@
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
+ * psxtmtest_unblocking_preempt/Makefile.am,
+ psxtmtest_unblocking_preempt/TEST.doc,
+ psxtmtest_unblocking_preempt/init.c: New files.
+
+2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
+
* psxtmtest_unblocking_nopreempt/init.c: Fix pattern.
2011-07-20 Joel Sherrill <joel.sherrill at oarcorp.com>
diff -u /dev/null rtems-testing/rtems-test-template/psxtmtest_unblocking_preempt/Makefile.am:1.1
--- /dev/null Wed Jul 20 17:10:04 2011
+++ rtems-testing/rtems-test-template/psxtmtest_unblocking_preempt/Makefile.am Wed Jul 20 16:37:56 2011
@@ -0,0 +1,30 @@
+##
+## $Id$
+##
+
+MANAGERS = all
+
+rtems_tests_PROGRAMS = @LOWER@
+ at LOWER@_SOURCES = init.c ../../tmtests/include/timesys.h \
+ ../../support/src/tmtests_empty_function.c \
+ ../../support/src/tmtests_support.c
+
+dist_rtems_tests_DATA = @LOWER at .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 = $(@LOWER at _OBJECTS) $(@LOWER at _LDADD)
+LINK_LIBS = $(@LOWER at _LDLIBS)
+
+ at LOWER@$(EXEEXT): $(@LOWER at _OBJECTS) $(@LOWER at _DEPENDENCIES)
+ @rm -f @LOWER@$(EXEEXT)
+ $(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff -u /dev/null rtems-testing/rtems-test-template/psxtmtest_unblocking_preempt/TEST.doc:1.1
--- /dev/null Wed Jul 20 17:10:04 2011
+++ rtems-testing/rtems-test-template/psxtmtest_unblocking_preempt/TEST.doc Wed Jul 20 16:37:56 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:
+
++ @DESC@
diff -u /dev/null rtems-testing/rtems-test-template/psxtmtest_unblocking_preempt/init.c:1.1
--- /dev/null Wed Jul 20 17:10:04 2011
+++ rtems-testing/rtems-test-template/psxtmtest_unblocking_preempt/init.c Wed Jul 20 16:37:56 2011
@@ -0,0 +1,157 @@
+/*
+ * 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 = 0; /* XXX blocking operation goes here */
+ end_time = benchmark_timer_read();
+
+ rtems_test_assert( status == 0 );
+
+ put_time(
+ "@DESC@",
+ end_time,
+ OPERATION_COUNT,
+ 0,
+ 0
+ );
+
+ puts( "*** END OF POSIX TIME TEST XXX @TESTNUM@ ***" );
+ rtems_test_exit( 0 );
+ return NULL;
+}
+
+void *Middle(
+ void *argument
+)
+{
+ int status;
+
+ status = 0; /* XXX blocking operation goes here */
+ rtems_test_assert( status == 0 );
+
+ /* thread switch occurs */
+
+ /* XXX unblocking operation goes here */
+ /* XXX cast as void and ignore return status -- should never return */
+
+ /* thread switch occurs */
+
+ /* should never return */
+ rtems_test_assert( FALSE );
+ 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 XXX @TESTNUM@ ***" );
+
+ /*
+ * Deliberately create the XXX BEFORE the threads. This way the
+ * threads should preempt this thread and block as they are created.
+ */
+ status = 0; /* XXX create resource */
+ rtems_test_assert( status == 0 );
+
+ /*
+ * Obtain the XXX so the threads will block.
+ */
+ status = 0; /* XXX lock resource to ensure thread blocks */
+ 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 = 0; /* XXX release the resource. Threads unblock and preempt */
+ /* thread switch occurs */
+
+ /* should never return */
+ rtems_test_assert( FALSE );
+ return NULL;
+}
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
+
+#define CONFIGURE_MAXIMUM_POSIX_THREADS OPERATION_COUNT + 2
+/* XXX make sure you configure the resource */
+#define CONFIGURE_POSIX_INIT_THREAD_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
+ /* end of file */
--
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/f93175fc/attachment-0001.html>
More information about the vc
mailing list