summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuan-Hsun Chen <c0066c@gmail.com>2017-01-30 19:34:28 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-01-31 07:20:06 +0100
commit166a9f67cde9085a74d6d5d962160b3c92b3e3d7 (patch)
treef73d3e00c2929d12283fd826d7ea799b2b87f83f
parentc5430e0618fbe1517417a0b353c12924a8934554 (diff)
downloadrtems-166a9f67cde9085a74d6d5d962160b3c92b3e3d7.tar.bz2
sprmsched01/spedfsched04: Revise
Instead of using the target time and console driver, both tests now use assertions and rtems_rate_monotonic_get_status() to verify the count of postponed jobs. The setting of spedfsched04 is slightly changed. Close #2795.
-rw-r--r--testsuites/sptests/spedfsched04/Makefile.am2
-rw-r--r--testsuites/sptests/spedfsched04/init.c86
-rw-r--r--testsuites/sptests/spedfsched04/spedfsched04.scn27
-rw-r--r--testsuites/sptests/sprmsched01/Makefile.am4
-rw-r--r--testsuites/sptests/sprmsched01/init.c71
-rw-r--r--testsuites/sptests/sprmsched01/sprmsched01.scn55
6 files changed, 92 insertions, 153 deletions
diff --git a/testsuites/sptests/spedfsched04/Makefile.am b/testsuites/sptests/spedfsched04/Makefile.am
index 39f8210134..a39519a374 100644
--- a/testsuites/sptests/spedfsched04/Makefile.am
+++ b/testsuites/sptests/spedfsched04/Makefile.am
@@ -1,6 +1,6 @@
rtems_tests_PROGRAMS = spedfsched04
-spedfsched04_SOURCES = init.c
+spedfsched04_SOURCES = init.c ../../support/src/spin.c
dist_rtems_tests_DATA = spedfsched04.scn
dist_rtems_tests_DATA += spedfsched04.doc
diff --git a/testsuites/sptests/spedfsched04/init.c b/testsuites/sptests/spedfsched04/init.c
index f80883d31d..bcaced994c 100644
--- a/testsuites/sptests/spedfsched04/init.c
+++ b/testsuites/sptests/spedfsched04/init.c
@@ -1,24 +1,25 @@
/**
- * @brief A heuristic example to demonstrate how the postponed jobs are handled.
+ * @brief A heuristic example to demonstrate how the postponed jobs are handled in EDF.
*
* Given two tasks with implicit deadline under EDF policy.
- * Task 1 has (4, 5) and task 2 has (4, 6), where (execution time, period/deadline).
- * For the simplicity, we only execute the first task twice.
+ * Task 1 has (400, 500) and task 2 has (450, 550), where (required ticks, period/deadline).
+ * For the simplicity, we only execute the first task three times.
* In the original implementation in v4.11, no matter how many periods are
* expired, only one job will be released with a shifted deadline assignment.
*
- * In this example, the first job of task 2 will be blocked by the second job
- * of task 1, so that there at least one following job is postponed.
- * Due to overhead/delay, the second following job will be postponed as well.
+ * In this example, task 2 will be blocked by the second and third jobs
+ * of task 1, so that there are two jobs are postponed.
+ * Due to the domino effects, the following jobs of task 2 will be postponed until Job 9.
*
* If the overrun handling is correct, the period of task 2 changes back to
- * normal status at time 22.
- * Otherwise, the release time of job 3 is no longer periodic.
+ * normal status at Job 9.
+ * Otherwise, the release time of job 3 is no longer periodic
+ * and there is no more postponed jobs.
*
*/
/*
- * COPYRIGHT (c) 2016 Kuan-Hsun Chen.
+ * COPYRIGHT (c) 2016-2017 Kuan-Hsun Chen.
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
@@ -30,23 +31,19 @@
#endif
#include <rtems/cpuuse.h>
-#include <rtems/counter.h>
-
-#include <stdio.h>
-#include <inttypes.h>
-
-#include "tmacros.h"
+#include <tmacros.h>
+#include "test_support.h"
const char rtems_test_name[] = "SPEDFSCHED 4";
-static const uint32_t Periods[] = { 5000, 6000 };
-static const uint32_t Iterations[] = { 4000, 4000 };
+static const uint32_t Periods[] = { 500, 550 };
+static const uint32_t Iterations[] = { 400, 450 };
static const rtems_name Task_name[] = {
rtems_build_name( 'T', 'A', '1', ' ' ),
rtems_build_name( 'T', 'A', '2', ' ' )
};
static const rtems_task_priority Prio[3] = { 2, 5 };
-static const uint32_t testnumber = 11; /* stop condition */
+static const uint32_t testnumber = 9; /* stop condition */
static uint32_t tsk_counter[] = { 0, 0 };
static rtems_id Task_id[ 2 ];
@@ -58,35 +55,41 @@ static rtems_task Task(
rtems_task_argument argument
)
{
- rtems_status_code status;
- rtems_id RM_period;
- rtems_id selfid=rtems_task_self();
- uint32_t start, end, flag=0, index;
- rtems_counter_ticks t0;
+ rtems_status_code status;
+ rtems_id RM_period;
+ rtems_id selfid=rtems_task_self();
+ rtems_rate_monotonic_period_status period_status;
+ uint32_t flag=0;
- t0 = rtems_counter_nanoseconds_to_ticks( 1000000 ); //1ms ticks counter
- /*create period*/
+ /* create period */
status = rtems_rate_monotonic_create( Task_name[ argument ], &RM_period );
directive_failed( status, "rtems_rate_monotonic_create" );
while ( FOREVER ) {
status = rtems_rate_monotonic_period( RM_period, Periods[ argument ] );
- if( flag == 0 && status == RTEMS_TIMEOUT ){
- flag = 1;
- printf( "RTEMS_TIMEOUT\n" );
- } else if ( flag == 1 && status == RTEMS_SUCCESSFUL ) {
- flag = 0;
- printf( "RTEMS_SUCCESSFUL\n" );
- }
- start = rtems_clock_get_ticks_since_boot();
- printf( "Job %" PRIu32 " Task %" PRIuPTR " starts at tick %" PRIu32 ".\n", tsk_counter[ argument ]+1, argument, start );
- for( index = 0; index < Iterations[ argument ]; index++ ){
- rtems_counter_delay_ticks( t0 );
- }
- end = rtems_clock_get_ticks_since_boot();
- printf( " Job %" PRIu32" Task %" PRIuPTR " ends at tick %" PRIu32".\n", tsk_counter[ argument ]+1, argument, end );
+ /* Do some work */
+ rtems_test_spin_for_ticks( Iterations[ argument ] );
+
if( argument == 1 ){
+ if( status == RTEMS_TIMEOUT ){
+ if( flag == 0 ){
+ puts( "First time RTEMS_TIMEOUT" );
+ puts( "Task 2 should have 2 postponed job due to preemption." );
+ rtems_test_assert( period_status.postponed_jobs_count == 2 );
+ flag = 1;
+ }
+ } else if ( flag == 1 && status == RTEMS_SUCCESSFUL ) {
+ puts( "RTEMS_SUCCESSFUL" );
+ puts( "Overrun handling is finished, now Task 2 becomes normal." );
+ rtems_test_assert( period_status.postponed_jobs_count == 0 );
+ flag = 0;
+ }
+
+ /* Check the status */
+ status = rtems_rate_monotonic_get_status( RM_period, &period_status );
+ directive_failed( status, "rate_monotonic_get_status" );
+
if( tsk_counter[ argument ] == testnumber ){
TEST_END();
status = rtems_rate_monotonic_delete( RM_period );
@@ -97,7 +100,8 @@ static rtems_task Task(
tsk_counter[ argument ]+=1;
if ( argument == 0 ){
- if( tsk_counter[ argument ] == 2 ){
+ if( tsk_counter[ argument ] == 3 ){
+ puts("Task 1 has released 3 jobs and finished.");
status = rtems_rate_monotonic_delete( RM_period );
directive_failed( status, "rtems_rate_monotonic_delete" );
status = rtems_task_delete( selfid );
@@ -116,7 +120,6 @@ static rtems_task Init(
TEST_BEGIN();
- printf( "\nTicks per second in your system: %" PRIu32 "\n", rtems_clock_get_ticks_per_second() );
/* Create two tasks */
for ( index = 0; index < RTEMS_ARRAY_SIZE(Task_name); ++index ){
@@ -127,7 +130,6 @@ static rtems_task Init(
directive_failed( status, "rtems_task_create loop" );
}
-
/* After creating the periods for tasks, start to run them sequencially. */
for ( index = 0; index < RTEMS_ARRAY_SIZE(Task_name); ++index ){
status = rtems_task_start( Task_id[ index ], Task, index);
diff --git a/testsuites/sptests/spedfsched04/spedfsched04.scn b/testsuites/sptests/spedfsched04/spedfsched04.scn
index 6d8060bec0..f1c41c4a6e 100644
--- a/testsuites/sptests/spedfsched04/spedfsched04.scn
+++ b/testsuites/sptests/spedfsched04/spedfsched04.scn
@@ -1,24 +1,7 @@
-
-
*** BEGIN OF TEST SPEDFSCHED 4 ***
-
-Ticks per second in your system: 1000
-Job 1 Task 1 starts at tick 14.
- Job 1 Task 1 ends at tick 4023.
-Job 1 Task 2 starts at tick 4025.
-Job 2 Task 1 starts at tick 5013.
- Job 2 Task 1 ends at tick 9023.
- Job 1 Task 2 ends at tick 12045.
-System TIMEOUT
-Job 2 Task 2 starts at tick 12045.
- Job 2 Task 2 ends at tick 16054.
-Job 3 Task 2 starts at tick 16054.
- Job 3 Task 2 ends at tick 20061.
-System SUCCESSFUL
-Job 4 Task 2 starts at tick 22025.
- Job 4 Task 2 ends at tick 26033.
-Job 5 Task 2 starts at tick 28025.
- Job 5 Task 2 ends at tick 32033.
-Job 6 Task 2 starts at tick 34025.
- Job 6 Task 2 ends at tick 38033.
+Task 1 has released 3 jobs and finished.
+First time RTEMS_TIMEOUT
+Task 2 should have 2 postponed job due to preemption.
+RTEMS_SUCCESSFUL
+Overrun handling is finished, now Task 2 becomes normal.
*** END OF TEST SPEDFSCHED 4 ***
diff --git a/testsuites/sptests/sprmsched01/Makefile.am b/testsuites/sptests/sprmsched01/Makefile.am
index 068bb19a9e..a8cf788ef6 100644
--- a/testsuites/sptests/sprmsched01/Makefile.am
+++ b/testsuites/sptests/sprmsched01/Makefile.am
@@ -1,7 +1,7 @@
rtems_tests_PROGRAMS = sprmsched01
-sprmsched01_SOURCES = init.c
-
+sprmsched01_SOURCES = init.c ../../support/src/spin.c
+
dist_rtems_tests_DATA = sprmsched01.scn
dist_rtems_tests_DATA += sprmsched01.doc
diff --git a/testsuites/sptests/sprmsched01/init.c b/testsuites/sptests/sprmsched01/init.c
index 2332920558..f806605ec8 100644
--- a/testsuites/sptests/sprmsched01/init.c
+++ b/testsuites/sptests/sprmsched01/init.c
@@ -1,5 +1,5 @@
/**
- * @brief A heuristic example to demonstrate how the postponed jobs are handled.
+ * @brief A heuristic example to demonstrate how the postponed jobs are handled in RMS.
*
* Given two tasks with implicit deadline under fixed-priority scheudling.
* Task 1 has (6, 10) and task 2 has (1, 2), where (execution time, deadline/period).
@@ -20,7 +20,7 @@
*/
/*
- * COPYRIGHT (c) 2016 Kuan-Hsun Chen.
+ * COPYRIGHT (c) 2016-2017 Kuan-Hsun Chen.
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
@@ -32,23 +32,19 @@
#endif
#include <rtems/cpuuse.h>
-#include <rtems/counter.h>
-
-#include <stdio.h>
-#include <inttypes.h>
-
-#include "tmacros.h"
+#include <tmacros.h>
+#include "test_support.h"
const char rtems_test_name[] = "SPRMSCHED 1";
-static const uint32_t Periods[] = { 10000, 2000 };
-static const uint32_t Iterations[] = { 6000, 1000 };
+static const uint32_t Periods[] = { 1000, 200 };
+static const uint32_t Iterations[] = { 600, 100 };
static const rtems_name Task_name[] = {
rtems_build_name( 'T', 'A', '1', ' ' ),
rtems_build_name( 'T', 'A', '2', ' ' )
};
static const rtems_task_priority Prio[3] = { 2, 5 };
-static const uint32_t testnumber = 11; /* stop condition */
+static const uint32_t testnumber = 9; /* stop condition */
static uint32_t tsk_counter[] = { 0, 0 };
static rtems_id Task_id[ 2 ];
@@ -60,39 +56,41 @@ static rtems_task Task(
rtems_task_argument argument
)
{
- rtems_status_code status;
- rtems_id RM_period;
- rtems_id selfid=rtems_task_self();
- uint32_t start, end, flag=0, index;
- rtems_counter_ticks t0;
+ rtems_status_code status;
+ rtems_id RM_period;
+ rtems_id selfid=rtems_task_self();
+ rtems_rate_monotonic_period_status period_status;
+ uint32_t flag=0;
- t0 = rtems_counter_nanoseconds_to_ticks( 1000000 ); //1ms ticks counter
/*create period*/
status = rtems_rate_monotonic_create( Task_name[ argument ], &RM_period );
directive_failed( status, "rtems_rate_monotonic_create" );
while ( FOREVER ) {
status = rtems_rate_monotonic_period( RM_period, Periods[ argument ] );
- //directive_failed( status, "rtems_rate_monotonic_period" ); let TIMEOUT pass
- if( argument == 1 && flag == 0 && status == RTEMS_TIMEOUT ){
- flag = 1;
- printf( "RTEMS_TIMEOUT\n" );
- } else if ( flag == 1 && status == RTEMS_SUCCESSFUL ) {
- flag = 0;
- printf( "RTEMS_SUCCESSFUL\n" );
- }
- start = rtems_clock_get_ticks_since_boot();
- if ( argument == 1 )
- printf( "Job %" PRIu32 " Task %" PRIuPTR " starts at tick %" PRIu32 ".\n", tsk_counter[ argument ]+1, argument, start );
- else
- printf( "Task %" PRIuPTR " starts at tick %" PRIu32 ".\n", argument, start );
- for( index = 0; index < Iterations[ argument ]; index++ ){
- rtems_counter_delay_ticks( t0 );
- }
- end = rtems_clock_get_ticks_since_boot();
- printf( " Job %" PRIu32" Task %" PRIuPTR " ends at tick %" PRIu32".\n", tsk_counter[ argument ]+1, argument, end );
+ /* Do some work */
+ rtems_test_spin_for_ticks( Iterations[ argument ] );
+
if( argument == 1 ){
+ if( status == RTEMS_TIMEOUT ){
+ if( flag == 0 ){
+ puts( "First time RTEMS_TIMEOUT" );
+ puts( "Task 2 should have 3 postponed jobs due to preemption." );
+ rtems_test_assert( period_status.postponed_jobs_count == 3 );
+ flag = 1;
+ }
+ } else if ( flag == 1 && status == RTEMS_SUCCESSFUL ) {
+ puts( "RTEMS_SUCCESSFUL" );
+ puts( "Overrun handling is finished, now Task 2 becomes normal." );
+ rtems_test_assert( period_status.postponed_jobs_count == 0 );
+ flag = 0;
+ }
+
+ /* Check the status */
+ status = rtems_rate_monotonic_get_status( RM_period, &period_status );
+ directive_failed( status, "rate_monotonic_get_status" );
+
if( tsk_counter[ argument ] == testnumber ){
TEST_END();
status = rtems_rate_monotonic_delete( RM_period );
@@ -104,6 +102,7 @@ static rtems_task Task(
tsk_counter[ argument ]+=1;
if ( argument == 0 ){
if( tsk_counter[ argument ] == 2 ){
+ puts( "Task 1 has released two jobs" );
status = rtems_rate_monotonic_delete( RM_period );
directive_failed( status, "rtems_rate_monotonic_delete" );
status = rtems_task_delete( selfid );
@@ -122,8 +121,6 @@ static rtems_task Init(
TEST_BEGIN();
- printf( "\nTicks per second in your system: %" PRIu32 "\n", rtems_clock_get_ticks_per_second() );
-
/* Create two tasks */
for ( index = 0; index < RTEMS_ARRAY_SIZE(Task_name); ++index ){
status = rtems_task_create(
diff --git a/testsuites/sptests/sprmsched01/sprmsched01.scn b/testsuites/sptests/sprmsched01/sprmsched01.scn
index 9205a590ea..e01712cfd4 100644
--- a/testsuites/sptests/sprmsched01/sprmsched01.scn
+++ b/testsuites/sptests/sprmsched01/sprmsched01.scn
@@ -1,50 +1,7 @@
-
-
-*** BEGIN OF TEST Rate Monotonic 01 - Overrun Test ***
-
-Ticks per second in your system: 1000
-Job 1 Task 1 starts at tick 13.
- Job 1 Task 1 ends at tick 6021.
-Job 1 Task 2 starts at tick 6022.
- Job 1 Task 2 ends at tick 7024.
-Job 2 Task 2 starts at tick 8022.
- Job 2 Task 2 ends at tick 9023.
-Job 2 Task 1 starts at tick 10013.
- Job 2 Task 1 ends at tick 16021.
-Job 3 Task 2 starts at tick 16023.
- Job 3 Task 2 ends at tick 17024.
-RTEMS_TIMEOUT
-Job 4 Task 2 starts at tick 17025.
- Job 4 Task 2 ends at tick 18026.
-Job 5 Task 2 starts at tick 18026.
- Job 5 Task 2 ends at tick 19027.
-Job 6 Task 2 starts at tick 19028.
- Job 6 Task 2 ends at tick 20029.
-Job 7 Task 2 starts at tick 20029.
- Job 7 Task 2 ends at tick 21031.
-Job 8 Task 2 starts at tick 21031.
- Job 8 Task 2 ends at tick 22033.
-Job 9 Task 2 starts at tick 22033.
- Job 9 Task 2 ends at tick 23035.
+*** BEGIN OF TEST SPRMSCHED 1 ***
+Task 1 has released two jobs
+First time RTEMS_TIMEOUT
+Task 2 should have 3 postponed jobs due to preemption.
RTEMS_SUCCESSFUL
-Job 10 Task 2 starts at tick 24022.
- Job 10 Task 2 ends at tick 25023.
-Job 11 Task 2 starts at tick 26022.
- Job 11 Task 2 ends at tick 27024.
-Job 12 Task 2 starts at tick 28022.
- Job 12 Task 2 ends at tick 29024.
-Job 13 Task 2 starts at tick 30022.
- Job 13 Task 2 ends at tick 31023.
-Job 14 Task 2 starts at tick 32022.
- Job 14 Task 2 ends at tick 33023.
-Job 15 Task 2 starts at tick 34022.
- Job 15 Task 2 ends at tick 35023.
-Job 16 Task 2 starts at tick 36022.
- Job 16 Task 2 ends at tick 37023.
-Period information by period
---- CPU times are in seconds ---
---- Wall times are in seconds ---
- ID OWNER COUNT MISSED CPU TIME WALL TIME
- MIN/MAX/AVG MIN/MAX/AVG
-0x42010002 TA2 15 6 1.001686/7.012146/2.404131 1.001698/13.013378/5.204723
-*** END OF TEST Rate Monotonic 01 ***
+Overrun handling is finished, now Task 2 becomes normal.
+*** END OF TEST SPRMSCHED 1 ***