sptests/spedfsched04: Merge and fix

Merge into one file and fix obvious problems (e.g. out of bounds array
access).

Update #2795.

4 files changed, 113 insertions, 193 deletions

diff --git a/testsuites/sptests/spedfsched04/Makefile.am b/testsuites/sptests/spedfsched04/Makefile.am
index cd07f3ffa2..39f8210134 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 tasks.c system.h
+spedfsched04_SOURCES = init.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 b1401e6709..f80883d31d 100644
--- a/testsuites/sptests/spedfsched04/init.c
+++ b/testsuites/sptests/spedfsched04/init.c
@@ -1,7 +1,19 @@
 /**
- * @file spedfsched04/init.c
+ * @brief A heuristic example to demonstrate how the postponed jobs are handled.
  *
- * @brief A init task body for spedfsched04 example.
+ * 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.
+ * 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.
+ *
+ * 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.
  *
  */
 
@@ -17,54 +29,127 @@
 #include "config.h"
 #endif
 
-#define CONFIGURE_INIT
-#include "system.h"
+#include <rtems/cpuuse.h>
+#include <rtems/counter.h>
 
-#include <rtems/rtems/tasksimpl.h>
-#include <rtems/test.h>
-#include <rtems/status-checks.h>
+#include <stdio.h>
+#include <inttypes.h>
 
-const char rtems_test_name[] = "SPEDFSCHED 4 - Overrun Test";
+#include "tmacros.h"
 
-/* Global variables */
-rtems_id   Task_id[ 2 ];         /* array of task ids */
-rtems_name Task_name[ 2 ];       /* array of task names */
-uint32_t tick_per_second;        /* time reference */
-int testnumber = 5;                  /* stop condition */
+const char rtems_test_name[] = "SPEDFSCHED 4";
 
-rtems_task_priority Prio[ 3 ] = { 0, 2, 5 };
+static const uint32_t Periods[] = { 5000, 6000 };
+static const uint32_t Iterations[] = { 4000, 4000 };
+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 */
 
-rtems_task Init(
-	rtems_task_argument argument
+static uint32_t tsk_counter[] = { 0, 0 };
+static rtems_id   Task_id[ 2 ];
+
+/**
+ * @brief Task body
+ */
+static rtems_task Task(
+  rtems_task_argument argument
 )
 {
-  uint32_t    index;
-  TEST_BEGIN();
   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;
+
+  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 ] );
+    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" );
+    }
 
-  tick_per_second = rtems_clock_get_ticks_per_second();
-  printf( "\nTicks per second in your system: %" PRIu32 "\n", tick_per_second );
+    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 );
+    if( argument == 1 ){
+      if( tsk_counter[ argument ] == testnumber ){
+        TEST_END();
+        status = rtems_rate_monotonic_delete( RM_period );
+        directive_failed( status, "rtems_rate_monotonic_delete" );
+        rtems_test_exit( 0 );
+      }
+    }
 
-  Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
-  Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
+    tsk_counter[ argument ]+=1;
+    if ( argument == 0 ){
+      if( tsk_counter[ argument ] == 2 ){
+        status = rtems_rate_monotonic_delete( RM_period );
+        directive_failed( status, "rtems_rate_monotonic_delete" );
+        status = rtems_task_delete( selfid );
+        directive_failed( status, "rtems_task_delete" );
+      }
+    }
+  }
+}
+
+static rtems_task Init(
+	rtems_task_argument argument
+)
+{
+  uint32_t     index;
+  rtems_status_code status;
+
+  TEST_BEGIN();
+
+  printf( "\nTicks per second in your system: %" PRIu32 "\n", rtems_clock_get_ticks_per_second() );
 
   /* Create two tasks */
-  for ( index = 1; index <= 2; index++ ){
+  for ( index = 0; index < RTEMS_ARRAY_SIZE(Task_name); ++index ){
     status = rtems_task_create(
-      Task_name[ index ], Prio[ index ], RTEMS_MINIMUM_STACK_SIZE, RTEMS_DEFAULT_MODES,
+      Task_name[ index ], Prio[index], RTEMS_MINIMUM_STACK_SIZE, RTEMS_DEFAULT_MODES,
       RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ index ]
     );
     directive_failed( status, "rtems_task_create loop" );
   }
 
+
   /* After creating the periods for tasks, start to run them sequencially. */
-  for ( index = 1; index <= 2; index++ ){
+  for ( index = 0; index < RTEMS_ARRAY_SIZE(Task_name); ++index ){
     status = rtems_task_start( Task_id[ index ], Task, index);
-    directive_failed( status, "rtems_task_start loop" );
+    directive_failed( status, "rtems_task_start loop");
   }
-
   status = rtems_task_delete( RTEMS_SELF );
   directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
 }
 
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_MICROSECONDS_PER_TICK     1000
+#define CONFIGURE_MAXIMUM_TASKS             3
+#define CONFIGURE_MAXIMUM_PERIODS           2
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_SCHEDULER_EDF
+
+#define CONFIGURE_INITIAL_EXTENSIONS \
+  RTEMS_TEST_INITIAL_EXTENSION
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
diff --git a/testsuites/sptests/spedfsched04/system.h b/testsuites/sptests/spedfsched04/system.h
deleted file mode 100644
index 93b436757e..0000000000
--- a/testsuites/sptests/spedfsched04/system.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @file spedfsched04/system.h
- *
- * @brief spedfsched04 example header
- */
-
-/*
- *  COPYRIGHT (c) 1989-2007.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  COPYRIGHT (c) 2016 Kuan-Hsun Chen.
- *
- *  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.
- */
-
-
-#include <inttypes.h>
-#include <rtems.h>
-
-#include <tmacros.h>
-
-/* function prototypes */
-
-rtems_task Init(
-  rtems_task_argument argument
-);
-
-rtems_task Task(
-  rtems_task_argument argument
-);
-
-/*
- *  Keep the names and IDs in global variables so another task can use them.
- */
-
-extern rtems_id   Task_id[ 2 ];         /* array of task ids */
-extern rtems_name Task_name[ 2 ];       /* array of task names */
-extern uint32_t tick_per_second;        /* time reference */
-extern int testnumber;                  /* stop condition */
-
-/* configuration information */
-
-#include <bsp.h> /* for device driver prototypes */
-
-#define CONFIGURE_SCHEDULER_EDF
-
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_MICROSECONDS_PER_TICK     1000   // NB: 10 and lower gives system failure for erc32 simulator
-#define CONFIGURE_MAXIMUM_TASKS             3
-#define CONFIGURE_MAXIMUM_PRIORITY          15
-#define CONFIGURE_EXTRA_TASK_STACKS         (20 * RTEMS_MINIMUM_STACK_SIZE)
-#define CONFIGURE_MAXIMUM_PERIODS           3
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#include <rtems/confdefs.h>
-
-
-/* end of include file */
diff --git a/testsuites/sptests/spedfsched04/tasks.c b/testsuites/sptests/spedfsched04/tasks.c
deleted file mode 100644
index 36d6013447..0000000000
--- a/testsuites/sptests/spedfsched04/tasks.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * @file sprmsched04/tasks.c
- *
- * @brief A heuristic example to demonstrate how the postponed jobs are handled.
- *
- * 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.
- * 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.
- *
- * 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.
- *
- */
-
-/*
- *  COPYRIGHT (c) 2016 Kuan-Hsun Chen.
- *
- *  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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "system.h"
-#include <rtems/score/watchdogimpl.h>
-
-/* CPU usage and Rate monotonic manger statistics */
-#include "rtems/cpuuse.h"
-#include "rtems/counter.h"
-
-uint32_t    Periods[ 3 ] = { 0, 5000, 6000 };
-uint32_t    Iterations[ 3 ] = { 0, 4000, 4000 };
-uint32_t    tsk_counter[ 3 ] = { 0, 0, 0 };
-
-/**
- * @brief Task body
- */
-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, index, flag = 0;
-  rtems_counter_ticks t0 = rtems_counter_nanoseconds_to_ticks( 1000000 );
-
-  /*create period*/
-  status = rtems_rate_monotonic_create( argument, &RM_period );
-  directive_failed( status, "rtems_rate_monotonic_create" );
-
-  switch ( argument ) {
-    case 1:
-    case 2:
-      while ( FOREVER ) {
-        status = rtems_rate_monotonic_period( RM_period, Periods[ argument ]);
-        if ( flag == 0 && status == RTEMS_TIMEOUT ){
-          printf( "System TIMEOUT \n" );
-          flag = 1;
-        }else if ( flag == 1 && status == RTEMS_SUCCESSFUL ){
-          printf( "System SUCCESSFUL \n" );
-          flag = 0;
-        }
-
-        start = rtems_clock_get_ticks_since_boot();
-        printf( "Job %d Task %d starts at tick %d.\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 %d Task %d ends at tick %d.\n", tsk_counter[ argument ]+1, argument, end );
-        if( argument == 2 ){
-          if( tsk_counter[ argument ] == testnumber ){
-            TEST_END();
-            status = rtems_rate_monotonic_delete( RM_period );
-            directive_failed( status, "rtems_rate_monotonic_delete" );
-            rtems_test_exit( 0 );
-          }
-        }
-        tsk_counter[ argument ]+=1;
-        if ( argument == 1 ){
-          if( tsk_counter[ argument ] == 2 ){
-				    status = rtems_rate_monotonic_delete( RM_period );
-            directive_failed( status, "rtems_rate_monotonic_delete" );
-            status = rtems_task_delete( selfid );
-            directive_failed( status, "rtems_task_delete" );
-          }
-        }
-      }
-      break;
-  }
-}
-