Changeset 4984ee4 in rtems

Timestamp:

Sep 9, 2014, 3:13:51 PM (6 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

f59e64f2

Parents:

b5f9ad2

git-author:

Sebastian Huber <sebastian.huber@…> (09/09/14 15:13:51)

git-committer:

Sebastian Huber <sebastian.huber@…> (09/10/14 05:12:55)

Message:

sptests/sp39: Convert to sptests/spintrcritical21

Use interrupt critical section test support. Do not print end of test
message in case of failure.

Location:

testsuites/sptests

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• sp39/Makefile.am (deleted)
• spintrcritical21/Makefile.am (added)
• spintrcritical21/init.c (moved) (moved from testsuites/sptests/sp39/init.c) (7 diffs)
• spintrcritical21/spintrcritical21.doc (moved) (moved from testsuites/sptests/sp39/sp39.doc)
• spintrcritical21/spintrcritical21.scn (moved) (moved from testsuites/sptests/sp39/sp39.scn) (1 diff)
• spintrcritical21/system.h (moved) (moved from testsuites/sptests/sp39/system.h) (1 diff)

testsuites/sptests/Makefile.am

@@ -7 +7 @@
     sp10 sp11 sp12 sp13 sp14 sp15 sp16 sp17 sp18 sp19 \
     sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp27a           \
-    sp30 sp31 sp32 sp33 sp34 sp35      sp37 sp38 sp39 \
+    sp30 sp31 sp32 sp33 sp34 sp35      sp37 sp38 \
     sp40 sp41 sp42 sp43 sp44 sp45 sp46 sp47 sp48 sp49 \
     sp50 sp51 sp52 sp53 sp54 sp55 sp56 sp57 sp58 sp59 \
@@ -54 +54 @@
 _SUBDIRS += sptls01
 _SUBDIRS += spintrcritical20
+_SUBDIRS += spintrcritical21
 _SUBDIRS += spcontext01
 _SUBDIRS += spfatal26

testsuites/sptests/configure.ac

@@ -54 +54 @@
 sptls01/Makefile
 spintrcritical20/Makefile
+spintrcritical21/Makefile
 spcontext01/Makefile
 spfatal26/Makefile
@@ -99 +100 @@
 sp37/Makefile
 sp38/Makefile
-sp39/Makefile
 sp40/Makefile
 sp41/Makefile

testsuites/sptests/spintrcritical21/init.c

@@ -17 +17 @@
 #include "system.h"
 
+#include <intrcritical.h>
+
 #include <rtems/rtems/eventimpl.h>
 
-const char rtems_test_name[] = "SP 39";
+const char rtems_test_name[] = "SPINTRCRITICAL 21";
 
 /*
@@ -29 +31 @@
  */
 
-rtems_timer_service_routine test_event_from_isr(
-  rtems_id  timer,
-  void     *arg
-);
-rtems_timer_service_routine test_event_with_timeout_from_isr(
-  rtems_id  timer,
-  void     *arg
-);
+static volatile bool case_hit;
 
-volatile bool case_hit;
+static rtems_id main_task;
 
-rtems_id main_task;
-rtems_id other_task;
+static rtems_id other_task;
 
-rtems_timer_service_routine test_event_from_isr(
+static rtems_timer_service_routine test_event_from_isr(
   rtems_id  timer,
   void     *arg
@@ -65 +59 @@
     fatal_directive_check_status_only( status, RTEMS_SUCCESSFUL, "event send" );
 
-    case_hit = TRUE;
+    case_hit = true;
   }
   status = rtems_event_send( main_task, 0x01 );
@@ -71 +65 @@
 }
 
-rtems_timer_service_routine test_event_with_timeout_from_isr(
+static bool test_body_event_from_isr( void *arg )
+{
+  rtems_status_code status;
+  rtems_event_set   out;
+
+  (void) arg;
+
+  status = rtems_event_receive( 0x01, RTEMS_DEFAULT_OPTIONS, 0, &out );
+  rtems_test_assert( status == RTEMS_SUCCESSFUL );
+
+  return case_hit;
+}
+
+static rtems_timer_service_routine test_event_with_timeout_from_isr(
   rtems_id  timer,
   void     *arg
@@ -83 +90 @@
      *  just send and make it happy.
      */
-    case_hit = TRUE;
+    case_hit = true;
   }
   status = rtems_event_send( main_task, 0x01 );
   fatal_directive_check_status_only( status, RTEMS_SUCCESSFUL, "event send" );
+}
+
+static bool test_body_event_with_timeout_from_isr( void *arg )
+{
+  rtems_status_code status;
+  rtems_event_set   out;
+
+  (void) arg;
+
+  status = rtems_event_receive( 0x01, RTEMS_DEFAULT_OPTIONS, 1, &out );
+  rtems_test_assert( status == RTEMS_SUCCESSFUL || status == RTEMS_TIMEOUT );
+
+  return case_hit;
 }
 
@@ -94 +114 @@
 {
   rtems_status_code     status;
-  rtems_id              timer;
-  rtems_event_set       out;
-  int                   i;
-  int                   max;
-  uint32_t              iterations = 0;
 
   TEST_BEGIN();
 
   main_task = rtems_task_self();
-
-  /*
-   *  Timer used in multiple ways
-   */
-  status = rtems_timer_create( 1, &timer );
-  directive_failed( status, "rtems_timer_create" );
 
   status = rtems_task_create(
@@ -123 +132 @@
    * Test Event send successful from ISR -- receive is forever
    */
-  case_hit = FALSE;
-  iterations = 0;
-  max = 1;
 
-  while (1) {
-    if ( case_hit )
-      break;
-    status = rtems_timer_fire_after( timer, 1, test_event_from_isr, NULL );
-    directive_failed( status, "timer_fire_after failed" );
-
-    for (i=0 ; i<max ; i++ )
-      if ( _Event_Sync_state == THREAD_BLOCKING_OPERATION_SATISFIED )
-        break;
-
-    status = rtems_event_receive( 0x01, RTEMS_DEFAULT_OPTIONS, 0, &out );
-    directive_failed( status, "rtems_event_receive" );
-    if ( case_hit == TRUE )
-      break;
-    max += 2;
-
-    /* with our clock tick, this is about 30 seconds */
-    if ( ++iterations >= 4L * 1000L * 30L)
-      break;
-  }
+  case_hit = false;
+  interrupt_critical_section_test(
+    test_body_event_from_isr,
+    NULL,
+    test_event_from_isr
+  );
 
   printf(
     "Event sent from ISR hitting synchronization point has %soccurred\n",
-    (( case_hit == TRUE ) ? "" : "NOT ")
+    case_hit ? "" : "NOT "
   );
+
+  rtems_test_assert( case_hit );
 
   /*
    * Test Event send successful from ISR -- receive has timeout
    */
-  case_hit = FALSE;
-  iterations = 0;
-  max = 1;
 
-  while (1) {
-    if ( case_hit )
-      break;
-    status = rtems_timer_fire_after(
-      timer, 1, test_event_with_timeout_from_isr, NULL );
-    directive_failed( status, "timer_fire_after failed" );
-
-    for (i=0 ; i<max ; i++ )
-      if ( _Event_Sync_state == THREAD_BLOCKING_OPERATION_SATISFIED )
-        break;
-
-    status = rtems_event_receive( 0x01, RTEMS_DEFAULT_OPTIONS, 10, &out );
-    directive_failed( status, "rtems_event_receive" );
-    if ( case_hit == TRUE )
-      break;
-    max += 2;
-
-    /* with our clock tick, this is about 30 seconds */
-    if ( ++iterations >= 4L * 1000L * 30L)
-      break;
-  }
+  case_hit = false;
+  interrupt_critical_section_test(
+    test_body_event_with_timeout_from_isr,
+    NULL,
+    test_event_with_timeout_from_isr
+  );
 
   printf(
     "Event sent from ISR (with timeout) hitting synchronization "
       "point has %soccurred\n",
-    (( case_hit == TRUE ) ? "" : "NOT ")
+    case_hit ? "" : "NOT "
   );
+
+  rtems_test_assert( case_hit );
 
   TEST_END();

testsuites/sptests/spintrcritical21/spintrcritical21.scn

@@ -1 @@
-*** TEST 39 ***
+*** BEGIN OF TEST SPINTRCRITICAL 21 ***
 Event sent from ISR hitting synchronization point has occurred
 Event sent from ISR (with timeout) hitting synchronization point has occurred
-*** END OF TEST 39 ***
+*** END OF TEST SPINTRCRITICAL 21 ***

testsuites/sptests/spintrcritical21/system.h

@@ -33 +33 @@
 #define CONFIGURE_MAXIMUM_TASKS             2
 #define CONFIGURE_MAXIMUM_TIMERS            1
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS   1
 
 #include <rtems/confdefs.h>