smpschedaffinity05: Add test for worst case migration for affintiy scheduler.

This test uses a combination of priority and affinity to cause
the tasks running on all 4 cores to change due to one task priority
change.

6 files changed, 295 insertions, 0 deletions

diff --git a/testsuites/smptests/Makefile.am b/testsuites/smptests/Makefile.am
index e025dab892..29f802c18c 100644
--- a/testsuites/smptests/Makefile.am
+++ b/testsuites/smptests/Makefile.am
@@ -27,6 +27,7 @@ SUBDIRS += smpschedaffinity01
 SUBDIRS += smpschedaffinity02
 SUBDIRS += smpschedaffinity03
 SUBDIRS += smpschedaffinity04
+SUBDIRS += smpschedaffinity05
 SUBDIRS += smpscheduler01
 SUBDIRS += smpscheduler02
 SUBDIRS += smpscheduler03
diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac
index cb8ac655a9..c181cbcc07 100644
--- a/testsuites/smptests/configure.ac
+++ b/testsuites/smptests/configure.ac
@@ -85,6 +85,7 @@ smpschedaffinity01/Makefile
 smpschedaffinity02/Makefile
 smpschedaffinity03/Makefile
 smpschedaffinity04/Makefile
+smpschedaffinity05/Makefile
 smpscheduler01/Makefile
 smpscheduler02/Makefile
 smpscheduler03/Makefile
diff --git a/testsuites/smptests/smpschedaffinity05/Makefile.am b/testsuites/smptests/smpschedaffinity05/Makefile.am
new file mode 100644
index 0000000000..2577ba6a48
--- /dev/null
+++ b/testsuites/smptests/smpschedaffinity05/Makefile.am
@@ -0,0 +1,19 @@
+rtems_tests_PROGRAMS = smpschedaffinity05
+smpschedaffinity05_SOURCES = init.c
+
+dist_rtems_tests_DATA = smpschedaffinity05.scn smpschedaffinity05.doc
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/leaf.am
+
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+
+LINK_OBJS = $(smpschedaffinity05_OBJECTS)
+LINK_LIBS = $(smpschedaffinity05_LDLIBS)
+
+smpschedaffinity05$(EXEEXT): $(smpschedaffinity05_OBJECTS) $(smpschedaffinity05_DEPENDENCIES)
+	@rm -f smpschedaffinity05$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/smptests/smpschedaffinity05/init.c b/testsuites/smptests/smpschedaffinity05/init.c
new file mode 100644
index 0000000000..754c226687
--- /dev/null
+++ b/testsuites/smptests/smpschedaffinity05/init.c
@@ -0,0 +1,243 @@
+/*
+ *  COPYRIGHT (c) 2014.
+ *  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.org/license/LICENSE.
+ */
+
+/*
+ * Start 4 tasks with affinity for each of the 4 cpus.
+ * Allow tasks to set their actual cpu value and delete themselves.
+ * Verify the actual cpu values match the expected cpu values.
+ *
+ * Init task is at a lower priority 8 and the threads
+ * with affinity are at priority 4, so the affinity task
+ * on the core init is running on will preempt it.
+ *
+ * Test tasks run and delete themselves. 
+ * Init task never blocks.
+ */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include <rtems.h>
+
+#include "tmacros.h"
+
+const char rtems_test_name[] = "SMPSCHEDAFFINITY 5";
+
+#define NUM_CPUS   4
+#define TASK_COUNT 5
+
+struct task_data_t {
+  rtems_id            id;
+  cpu_set_t           cpuset;
+  rtems_task_priority priority;
+  bool                ran;
+  int                 expected_cpu;
+  int                 actual_cpu;
+  int                 migrate_cpu;
+};
+
+static struct task_data_t task_data[TASK_COUNT] = {
+  {0x0, {{0xc}}, 7, false,  3, -1,  2},
+  {0x0, {{0xf}}, 8, false,  2, -1, -1},
+  {0x0, {{0x3}}, 5, false,  1, -1,  0},
+  {0x0, {{0x9}}, 6, false,  0, -1,  3},
+  {0x0, {{0x2}}, 9, false, -1, -1,  1}
+};
+
+rtems_id           task_sem;
+ 
+static void verify_tasks(void);
+
+/*
+ * Spin loop to allow tasks to delay without yeilding the
+ * processor.
+ */
+static void test_delay(int ticks)
+{ 
+  rtems_interval start, stop;
+  start = rtems_clock_get_ticks_since_boot();
+  do {
+    stop = rtems_clock_get_ticks_since_boot();
+  } while ( (stop - start) < ticks );
+}
+
+static void task(rtems_task_argument arg)
+{
+  rtems_status_code   sc;
+
+  while (true) {
+    sc = rtems_semaphore_obtain (task_sem, RTEMS_NO_WAIT, 0);
+    if (sc == RTEMS_SUCCESSFUL) {
+      task_data[arg].ran = true;
+      task_data[arg].actual_cpu = rtems_get_current_processor();
+      rtems_semaphore_release(task_sem);
+    }
+  }
+}
+static void verify_tasks(void)
+{
+  int i;
+
+  printf("Verify Tasks Ran\n");
+ 
+  while( rtems_semaphore_obtain (task_sem, RTEMS_NO_WAIT, 0) != RTEMS_SUCCESSFUL );
+ 
+  /* Set Init task data */
+  task_data[0].ran = true;
+  task_data[0].actual_cpu = rtems_get_current_processor();
+
+  /* Verify all tasks */
+  for (i = 0; i < NUM_CPUS; i++) {
+    if (i==0)
+      printf("Init(%d): ran=%d expected=%d actual=%d\n", 
+        task_data[i].priority,
+        task_data[i].ran,
+        task_data[i].expected_cpu,
+        task_data[i].actual_cpu
+      );
+    else
+      printf( "TA0%d(%d): ran=%d expected=%d actual=%d\n", 
+        i, 
+        task_data[i].priority,
+        task_data[i].ran,
+        task_data[i].expected_cpu,
+        task_data[i].actual_cpu
+      );
+
+    /*  Abort test if values are not as expected */
+    if ( task_data[i].expected_cpu == -1 )
+      rtems_test_assert( task_data[i].ran == false );
+    else {
+      rtems_test_assert( task_data[i].ran == true );
+      rtems_test_assert( task_data[i].expected_cpu == task_data[i].actual_cpu );
+    }
+  }
+
+  rtems_semaphore_release(task_sem);
+}
+
+static void test(void)
+{
+  rtems_status_code   sc;
+  rtems_task_argument i;
+  size_t              size;
+  uint32_t            cpu_count;
+  rtems_task_priority priority;
+
+  /* Get the number of processors that we are using. */
+  cpu_count = rtems_get_processor_count();
+  if (cpu_count != 4) {
+    printf("Test requires a minimum of 4 cores\n");
+    return;
+  }
+
+  size = sizeof(cpu_set_t);
+  task_data[0].id = rtems_task_self();
+  printf("Create Semaphore\n");
+
+  sc = rtems_semaphore_create(  
+    rtems_build_name('S', 'E', 'M', '0'),
+    1,                                               /* initial count = 1 */
+    RTEMS_LOCAL                   |
+    RTEMS_SIMPLE_BINARY_SEMAPHORE |
+    RTEMS_NO_INHERIT_PRIORITY     |
+    RTEMS_NO_PRIORITY_CEILING     |
+    RTEMS_FIFO,
+    0,
+    &task_sem
+  );  
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+
+  /* Create and start tasks on each cpu with the appropriate affinity. */
+  for (i = 1; i < TASK_COUNT; i++) {
+
+      sc = rtems_task_create(
+        rtems_build_name('T', 'A', '0', '0'+i),
+        task_data[ i ].priority,
+        RTEMS_MINIMUM_STACK_SIZE,
+        RTEMS_DEFAULT_MODES,
+        RTEMS_DEFAULT_ATTRIBUTES,
+        &task_data[ i ].id
+      );
+      rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+  
+      sc = rtems_task_set_affinity( 
+        task_data[ i ].id, 
+        size, 
+        &task_data[i].cpuset
+      );
+      rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+      
+      printf(
+        "Start TA%d at priority %d on cpu %d\n", 
+         i, 
+         task_data[i].priority, 
+         task_data[i].expected_cpu
+      );
+      sc = rtems_task_start( task_data[ i ].id, task, i );
+      rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+  }
+
+  /* spin for 100 ticks */
+  test_delay(100);
+ 
+  verify_tasks();
+
+  i = TASK_COUNT - 1;
+  task_data[ i ].priority = 4;
+  printf("Set TA%d priority %d\n", i,task_data[i].priority );
+  sc = rtems_task_set_priority(
+    task_data[ i ].id,
+    task_data[ i ].priority,
+    &priority
+  );
+  test_delay(25);
+
+  while( rtems_semaphore_obtain (task_sem, RTEMS_NO_WAIT, 0) != RTEMS_SUCCESSFUL );
+  for (i = 0; i < TASK_COUNT; i++) {
+    task_data[ i ].expected_cpu = task_data[ i ].migrate_cpu;
+    task_data[ i ].actual_cpu = -1;
+    task_data[ i ].ran = false;
+  }
+  rtems_semaphore_release(task_sem);
+  test_delay(25);
+  verify_tasks();
+}
+
+static void Init(rtems_task_argument arg)
+{
+  TEST_BEGIN();
+
+  test();
+
+  TEST_END();
+  rtems_test_exit(0);
+}
+
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+
+#define CONFIGURE_SMP_APPLICATION
+
+#define CONFIGURE_SCHEDULER_PRIORITY_AFFINITY_SMP
+
+#define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS
+
+#define CONFIGURE_MAXIMUM_TASKS          TASK_COUNT
+
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
+#define CONFIGURE_INIT_TASK_PRIORITY       7
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
diff --git a/testsuites/smptests/smpschedaffinity05/smpschedaffinity05.doc b/testsuites/smptests/smpschedaffinity05/smpschedaffinity05.doc
new file mode 100644
index 0000000000..4fb02051c2
--- /dev/null
+++ b/testsuites/smptests/smpschedaffinity05/smpschedaffinity05.doc
@@ -0,0 +1,13 @@
+This file describes the directives and concepts tested by this test set.
+
+test set name: smpschedaffinity05
+
+directives:
+
+  - _Scheduler_priority_affinity_xxx 
+
+concepts:
+
+  - Ensure that worst case migration of tasks across 4 cores using
+    a combination of affinity and priority.  Ensure the highest
+    priority tasks are chosen to run on the correct cores.
diff --git a/testsuites/smptests/smpschedaffinity05/smpschedaffinity05.scn b/testsuites/smptests/smpschedaffinity05/smpschedaffinity05.scn
new file mode 100644
index 0000000000..83107e7e83
--- /dev/null
+++ b/testsuites/smptests/smpschedaffinity05/smpschedaffinity05.scn
@@ -0,0 +1,18 @@
+*** BEGIN OF TEST SMPSCHEDAFFINITY 5 ***
+Create Semaphore
+Start TA1 at priority 8 on cpu 2
+Start TA2 at priority 5 on cpu 1
+Start TA3 at priority 6 on cpu 0
+Start TA4 at priority 9 on cpu -1
+Verify Tasks Ran
+Init(7): ran=1 expected=3 actual=3
+TA01(8): ran=1 expected=2 actual=2
+TA02(5): ran=1 expected=1 actual=1
+TA03(6): ran=1 expected=0 actual=0
+Set TA4 priority 4
+Verify Tasks Ran
+Init(7): ran=1 expected=2 actual=2
+TA01(8): ran=0 expected=-1 actual=-1
+TA02(5): ran=1 expected=0 actual=0
+TA03(6): ran=1 expected=3 actual=3
+*** END OF TEST SMPSCHEDAFFINITY 5 ***