smpschedaffinity02: New test.

This test checks setting the affinity of a secondary task
on a two core system.

6 files changed, 283 insertions, 0 deletions

diff --git a/testsuites/smptests/Makefile.am b/testsuites/smptests/Makefile.am
index 227c036000..424fa286a3 100644
--- a/testsuites/smptests/Makefile.am
+++ b/testsuites/smptests/Makefile.am
@@ -24,6 +24,7 @@ SUBDIRS += smpmigration01
 SUBDIRS += smpmigration02
 SUBDIRS += smpmrsp01
 SUBDIRS += smpschedaffinity01
+SUBDIRS += smpschedaffinity02
 SUBDIRS += smpscheduler01
 SUBDIRS += smpscheduler02
 SUBDIRS += smpscheduler03
diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac
index 88b43cdf9d..eac0e656bd 100644
--- a/testsuites/smptests/configure.ac
+++ b/testsuites/smptests/configure.ac
@@ -82,6 +82,7 @@ smppsxaffinity01/Makefile
 smppsxaffinity02/Makefile
 smppsxsignal01/Makefile
 smpschedaffinity01/Makefile
+smpschedaffinity02/Makefile
 smpscheduler01/Makefile
 smpscheduler02/Makefile
 smpscheduler03/Makefile
diff --git a/testsuites/smptests/smpschedaffinity02/Makefile.am b/testsuites/smptests/smpschedaffinity02/Makefile.am
new file mode 100644
index 0000000000..ef56a90a99
--- /dev/null
+++ b/testsuites/smptests/smpschedaffinity02/Makefile.am
@@ -0,0 +1,19 @@
+rtems_tests_PROGRAMS = smpschedaffinity02
+smpschedaffinity02_SOURCES = init.c
+
+dist_rtems_tests_DATA = smpschedaffinity02.scn smpschedaffinity02.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 = $(smpschedaffinity02_OBJECTS)
+LINK_LIBS = $(smpschedaffinity02_LDLIBS)
+
+smpschedaffinity02$(EXEEXT): $(smpschedaffinity02_OBJECTS) $(smpschedaffinity02_DEPENDENCIES)
+	@rm -f smpschedaffinity02$(EXEEXT)
+	$(make-exe)
+
+include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/smptests/smpschedaffinity02/init.c b/testsuites/smptests/smpschedaffinity02/init.c
new file mode 100644
index 0000000000..a3e0ddf47b
--- /dev/null
+++ b/testsuites/smptests/smpschedaffinity02/init.c
@@ -0,0 +1,230 @@
+/*
+ *  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.
+ */
+
+/*
+ * Test designed for 2 cores: Init task and TA1 task.
+ * of equal priorities.  
+ *
+ *  - Set TA1 affinity to core 0 verify
+ *  - Set TA1 affinity to core 1 verify it does not run because
+ *    the Init task never blocks
+ *  - Set Init affinity to core 0 verify both tasks are on the correct cores.
+ */
+
+#ifdef HAVE_CONFIG_H
+  #include "config.h"
+#endif
+
+#include <rtems.h>
+
+#include "tmacros.h"
+
+const char rtems_test_name[] = "SMPSCHEDAFFINITY 2";
+
+#define NUM_CPUS   2
+
+struct task_data_t {
+  rtems_id   id;
+  int        expected_cpu;
+  cpu_set_t  cpuset;
+  bool       ran;
+  int        actual_cpu;
+};
+
+struct task_data_t task_data = {
+  0x0, 0, {{0x3}}, false, -1
+};
+
+rtems_id           task_sem;
+
+static void task(rtems_task_argument arg);
+static void show_threads(void);
+static void task_verify( bool ran, bool change_affinity, int cpu );
+static void init_verify( int expect ); 
+
+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_verify( bool ran, bool change_affinity, int cpu )
+{
+  rtems_status_code   sc;
+  size_t              size = sizeof(cpu_set_t);
+
+  /* Obtain the semaphore without blocking */
+  while( rtems_semaphore_obtain (task_sem, RTEMS_NO_WAIT, 0) != RTEMS_SUCCESSFUL );
+
+  /* print the expected and actual values */
+  printf( "TA01: expected=%d actual=%d ran=%d\n", 
+   task_data.expected_cpu,
+   task_data.actual_cpu,
+   task_data.ran
+   );
+
+  /* Verify expected results */
+  rtems_test_assert( task_data.ran == ran );
+  if (ran)
+    rtems_test_assert( task_data.expected_cpu == task_data.actual_cpu );
+
+  if (change_affinity) {
+    printf("Set TA01 to cpu %d\n", cpu);
+    CPU_ZERO(&task_data.cpuset);
+    CPU_SET(cpu, &task_data.cpuset);
+    sc = rtems_task_set_affinity( task_data.id, size, &task_data.cpuset );
+    rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+  }
+
+  /* Reset the states */
+  task_data.ran = false;
+  task_data.expected_cpu = cpu;
+
+  /* Release the semaphore */
+  rtems_semaphore_release(task_sem);
+} 
+
+static void init_verify( int expect ) 
+{
+  int cpu;
+
+
+  test_delay(20);
+
+  cpu = rtems_get_current_processor();
+  printf( "Init: expected=%d actual=%d\n", expect, cpu);
+  rtems_test_assert( expect == cpu );
+}
+
+static void task(rtems_task_argument arg)
+{
+  rtems_status_code   sc;
+
+  /* Never block and continually get core id  */
+  while (true) {
+    sc = rtems_semaphore_obtain (task_sem, RTEMS_NO_WAIT, 0);
+    if (sc == RTEMS_SUCCESSFUL) {
+      task_data.actual_cpu = rtems_get_current_processor();
+      task_data.ran = true;
+      rtems_semaphore_release(task_sem);
+    }
+  }
+}
+
+static void test(void)
+{
+  rtems_status_code   sc;
+  uint32_t            cpu_count;
+  rtems_id            id_self;
+  cpu_set_t           cpuset;
+ 
+  /* Get the number of processors that we are using. */
+  cpu_count = rtems_get_processor_count();
+  if (cpu_count < NUM_CPUS) {
+    printf("Error: Test requires at least 2 cpus\n");
+    return;
+  }
+
+  id_self = rtems_task_self();
+ 
+  printf("Create Semaphore\n");
+  sc = rtems_semaphore_create(  
+    rtems_build_name('S', 'E', 'M', '0'),
+    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);
+
+  printf("Create TA1\n");
+  sc = rtems_task_create(
+    rtems_build_name('T', 'A', '0', '1'),
+    4,
+    RTEMS_MINIMUM_STACK_SIZE,
+    RTEMS_DEFAULT_MODES,
+    RTEMS_DEFAULT_ATTRIBUTES,
+    &task_data.id
+  );
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+  /* TA1 should start on cpu  0, since init starts on core 1 */
+  sc = rtems_task_start( task_data.id, task, 1 );
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+  /* Verify Init task is on cpu 1  */
+  init_verify(1);
+
+  /* Verify TA1 on cpu 0 and set the affinity to cpu 0 */
+  task_verify( true, true, 0 );
+   
+  /* Verify Init task is on cpu 1  */
+  init_verify(1);
+
+  /* Verify TA1 on cpu 0 and change the affinity to cpu 1 */
+  task_verify( true, true, 1 );
+
+  /* Verify Init task is on cpu 1  */
+  init_verify(1);
+
+  /* Verify TA1 did not run */
+  task_verify( false, false, 1 );
+
+  /* Set affinity of Init to cpu 0 */
+  printf("Set Affinity of init task to cpu 0\n");
+  CPU_ZERO(&cpuset);
+  CPU_SET(0, &cpuset);
+  sc = rtems_task_set_affinity( id_self, sizeof(cpuset), &cpuset );
+  rtems_test_assert(sc == RTEMS_SUCCESSFUL);
+
+  /* Verify init task went to cpu 0 */
+  test_delay(50);
+  init_verify(0);
+
+  /* Verfiy TA1 is now running on cpu 1 */
+  task_verify(true, false, 1);
+}
+
+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          NUM_CPUS
+
+#define CONFIGURE_INIT_TASK_PRIORITY      4
+
+#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
diff --git a/testsuites/smptests/smpschedaffinity02/smpschedaffinity02.doc b/testsuites/smptests/smpschedaffinity02/smpschedaffinity02.doc
new file mode 100644
index 0000000000..0ade62a344
--- /dev/null
+++ b/testsuites/smptests/smpschedaffinity02/smpschedaffinity02.doc
@@ -0,0 +1,17 @@
+This file describes the directives and concepts tested by this test set.
+
+test set name: smpschedaffinity02
+
+directives:
+
+  - _Scheduler_priority_affinity_xxx 
+
+concepts:
+
+  Test designed for 2 cores: Init task and TA1 task.
+  of equal priorities.  
+ 
+   - Set TA1 affinity to core 0 verify core
+   - Set TA1 affinity to core 1 verify it does not run because
+     the Init task never blocks
+   - Set Init affinity to core 0 verify both tasks are on the correct cores.
diff --git a/testsuites/smptests/smpschedaffinity02/smpschedaffinity02.scn b/testsuites/smptests/smpschedaffinity02/smpschedaffinity02.scn
new file mode 100644
index 0000000000..b3a50a73c8
--- /dev/null
+++ b/testsuites/smptests/smpschedaffinity02/smpschedaffinity02.scn
@@ -0,0 +1,15 @@
+*** BEGIN OF TEST SMPSCHEDAFFINITY 2 ***
+Create Semaphore
+Create TA1
+Init: expected=1 actual=1
+TA01: expected=0 actual=0 ran=1
+Set TA01 to cpu 0
+Init: expected=1 actual=1
+TA01: expected=0 actual=0 ran=1
+Set TA01 to cpu 1
+Init: expected=1 actual=1
+TA01: expected=1 actual=0 ran=0
+Set Affinity of init task to cpu 0
+Init: expected=0 actual=0
+TA01: expected=1 actual=1 ran=1
+*** END OF TEST SMPSCHEDAFFINITY 2 ***