Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-11-16 12:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

score: Fix watchdog removal

Browse Source 
Under certain conditions a new watchdog was inserted with a wrong and
very large delta interval due to an incomplete iterator update.

Bug was introduced by 1ccbd05291.

Close #2501.
This commit is contained in:
Sebastian Huber
2015-12-20 21:47:12 +01:00
parent 93b959581c
commit 2cc001a15a
2 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cpukit/score/src/watchdogremove.c
View File

@@ -61,7 +61,16 @@ static void _Watchdog_Remove_it(
} }
if ( iterator->current == &the_watchdog->Node ) { if ( iterator->current == &the_watchdog->Node ) {
iterator->current = _Chain_Previous( &the_watchdog->Node ); Chain_Node *previous = _Chain_Previous( &the_watchdog->Node );
iterator->current = previous;
if ( previous != _Chain_Head( &header->Watchdogs ) ) {
Watchdog_Control *previous_watchdog;
previous_watchdog = (Watchdog_Control *) previous;
iterator->delta_interval += previous_watchdog->delta_interval;
}
} }
iterator_node = _Chain_Next( iterator_node ); iterator_node = _Chain_Next( iterator_node );

62
testsuites/sptests/spwatchdog/init.c
View File

@@ -36,7 +36,7 @@ static void test_watchdog_routine( Objects_Id id, void *arg )
static void init_watchdogs( static void init_watchdogs(
Watchdog_Header *header, Watchdog_Header *header,
Watchdog_Control watchdogs[3] Watchdog_Control watchdogs[4]
) )
{ {
Watchdog_Control *a = &watchdogs[0]; Watchdog_Control *a = &watchdogs[0];
@@ -105,23 +105,23 @@ static void test_watchdog_insert_and_remove( void )
/* Remove next watchdog of iterator */ /* Remove next watchdog of iterator */
_Watchdog_Remove( &header, c ); _Watchdog_Remove( &header, c );
rtems_test_assert( i.delta_interval == 2 ); rtems_test_assert( i.delta_interval == 4 );
rtems_test_assert( i.current == &b->Node ); rtems_test_assert( i.current == &b->Node );
/* Remove watchdog before the current watchdog of iterator */ /* Remove watchdog before the current watchdog of iterator */
_Watchdog_Remove( &header, a ); _Watchdog_Remove( &header, a );
rtems_test_assert( i.delta_interval == 4 ); rtems_test_assert( i.delta_interval == 6 );
rtems_test_assert( i.current == &b->Node ); rtems_test_assert( i.current == &b->Node );
/* Remove current (= last) watchdog of iterator */ /* Remove current (= last) watchdog of iterator */
_Watchdog_Remove( &header, b ); _Watchdog_Remove( &header, b );
rtems_test_assert( i.delta_interval == 4 ); rtems_test_assert( i.delta_interval == 6 );
rtems_test_assert( i.current == _Chain_Head( &header.Watchdogs ) ); rtems_test_assert( i.current == _Chain_Head( &header.Watchdogs ) );
/* Insert first watchdog */ /* Insert first watchdog */
a->initial = 1; a->initial = 1;
_Watchdog_Insert( &header, a ); _Watchdog_Insert( &header, a );
rtems_test_assert( i.delta_interval == 4 ); rtems_test_assert( i.delta_interval == 6 );
rtems_test_assert( i.current == _Chain_Head( &header.Watchdogs ) ); rtems_test_assert( i.current == _Chain_Head( &header.Watchdogs ) );
destroy_watchdogs( &header ); destroy_watchdogs( &header );
@@ -147,6 +147,57 @@ static void test_watchdog_insert_and_remove( void )
destroy_watchdogs( &header ); destroy_watchdogs( &header );
} }
static void init_watchdogs_remove_second_and_insert_first(
Watchdog_Header *header,
Watchdog_Control watchdogs[3]
)
{
Watchdog_Control *a = &watchdogs[0];
Watchdog_Control *b = &watchdogs[1];
Watchdog_Control *c = &watchdogs[2];
_Watchdog_Preinitialize( a );
_Watchdog_Preinitialize( b );
_Watchdog_Preinitialize( c );
_Watchdog_Header_initialize( header );
a->initial = 6;
_Watchdog_Insert( header, a );
rtems_test_assert( a->delta_interval == 6 );
b->initial = 8;
_Watchdog_Insert( header, b );
rtems_test_assert( a->delta_interval == 6 );
rtems_test_assert( b->delta_interval == 2 );
}
static void test_watchdog_remove_second_and_insert_first( void )
{
Watchdog_Header header;
Watchdog_Control watchdogs[3];
Watchdog_Control *a = &watchdogs[0];
Watchdog_Control *b = &watchdogs[1];
Watchdog_Control *c = &watchdogs[2];
Watchdog_Iterator i;
init_watchdogs_remove_second_and_insert_first( &header, watchdogs );
add_iterator( &header, &i, b );
_Watchdog_Remove( &header, b );
rtems_test_assert( i.delta_interval == 8 );
rtems_test_assert( i.current == &a->Node );
c->initial = 4;
_Watchdog_Insert( &header, c );
rtems_test_assert( a->delta_interval == 2 );
rtems_test_assert( c->delta_interval == 4 );
rtems_test_assert( i.delta_interval == 4 );
rtems_test_assert( i.current == &a->Node );
destroy_watchdogs( &header );
}
static void test_watchdog_static_init( void ) static void test_watchdog_static_init( void )
{ {
#if defined(RTEMS_USE_16_BIT_OBJECT) #if defined(RTEMS_USE_16_BIT_OBJECT)
@@ -184,6 +235,7 @@ rtems_task Init(
test_watchdog_static_init(); test_watchdog_static_init();
test_watchdog_insert_and_remove(); test_watchdog_insert_and_remove();
test_watchdog_remove_second_and_insert_first();
build_time( &time, 12, 31, 1988, 9, 0, 0, 0 ); build_time( &time, 12, 31, 1988, 9, 0, 0, 0 );