RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

sptests/spintrcritical09: Fix check order

Browse Source 
The critical section check never succeeded since watchdogs are ordered
with respect to the insertion time.  Now we call the watchdog routine if
appropriate and bypass the normal watchdog mechanic.
This commit is contained in:
Sebastian Huber
2012-11-12 17:58:48 +01:00
parent 8f1b6cdef5
commit 8f548cea5f
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
testsuites/sptests/spintrcritical09/init.c
View File

@@ -15,16 +15,10 @@
#include <tmacros.h> #include <tmacros.h>
#include <intrcritical.h> #include <intrcritical.h>
/* forward declarations to avoid warnings */ static rtems_id Semaphore;
rtems_task Init(rtems_task_argument argument); static bool case_hit;
rtems_timer_service_routine test_release_from_isr(rtems_id timer, void *arg);
Thread_blocking_operation_States getState(void);
rtems_id Main_task; static Thread_blocking_operation_States getState(void)
rtems_id Semaphore;
volatile bool case_hit;
Thread_blocking_operation_States getState(void)
{ {
Objects_Locations location; Objects_Locations location;
Semaphore_Control *sem; Semaphore_Control *sem;
@@ -40,17 +34,33 @@ Thread_blocking_operation_States getState(void)
return sem->Core_control.semaphore.Wait_queue.sync_state; return sem->Core_control.semaphore.Wait_queue.sync_state;
} }
rtems_timer_service_routine test_release_from_isr( static rtems_timer_service_routine test_release_from_isr(
rtems_id timer, rtems_id timer,
void *arg void *arg
) )
{ {
if ( getState() == THREAD_BLOCKING_OPERATION_TIMEOUT ) { Chain_Control *chain = &_Watchdog_Ticks_chain;
case_hit = true;
if ( !_Chain_Is_empty( chain ) ) {
Watchdog_Control *watchdog = _Watchdog_First( chain );
if (
watchdog->delta_interval == 0
&& watchdog->routine == _Thread_queue_Timeout
) {
Watchdog_States state = _Watchdog_Remove( watchdog );
rtems_test_assert( state == WATCHDOG_ACTIVE );
(*watchdog->routine)( watchdog->id, watchdog->user_data );
if ( getState() == THREAD_BLOCKING_OPERATION_TIMEOUT ) {
case_hit = true;
}
}
} }
} }
rtems_task Init( static rtems_task Init(
rtems_task_argument ignored rtems_task_argument ignored
) )
{ {
@@ -63,15 +73,13 @@ rtems_task Init(
puts( "Init - Trying to generate timeout from ISR while blocking" ); puts( "Init - Trying to generate timeout from ISR while blocking" );
sc = rtems_semaphore_create( sc = rtems_semaphore_create(
rtems_build_name( 'S', 'M', '1', ' ' ), rtems_build_name( 'S', 'M', '1', ' ' ),
1, 0,
RTEMS_DEFAULT_ATTRIBUTES, RTEMS_DEFAULT_ATTRIBUTES,
RTEMS_NO_PRIORITY, RTEMS_NO_PRIORITY,
&Semaphore &Semaphore
); );
directive_failed( sc, "rtems_semaphore_create of SM1" ); directive_failed( sc, "rtems_semaphore_create of SM1" );
Main_task = rtems_task_self();
interrupt_critical_section_test_support_initialize( test_release_from_isr ); interrupt_critical_section_test_support_initialize( test_release_from_isr );
case_hit = false; case_hit = false;
@@ -97,7 +105,7 @@ rtems_task Init(
#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
#define CONFIGURE_MAXIMUM_TASKS 2 #define CONFIGURE_MAXIMUM_TASKS 1
#define CONFIGURE_MAXIMUM_TIMERS 1 #define CONFIGURE_MAXIMUM_TIMERS 1
#define CONFIGURE_MAXIMUM_SEMAPHORES 1 #define CONFIGURE_MAXIMUM_SEMAPHORES 1
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_RTEMS_INIT_TASKS_TABLE