From 5729f62e12673f322451fd4dcd6e790ec1e2ccef Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 29 Mar 2002 15:32:08 +0000 Subject: 2001-03-29 Joel Sherrill * Per PR147 addressed problems when reseting and inserting a timer into a timer chain that did not honor time passage since the last time the timer server was scheduled and the new insertion. * sp31/sp31.scn, sp31/task1.c: Added test code to detect this case. --- testsuites/sptests/sp31/sp31.scn | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'testsuites/sptests/sp31/sp31.scn') diff --git a/testsuites/sptests/sp31/sp31.scn b/testsuites/sptests/sp31/sp31.scn index f39ac58054..9f94652602 100644 --- a/testsuites/sptests/sp31/sp31.scn +++ b/testsuites/sptests/sp31/sp31.scn @@ -1,18 +1,41 @@ *** TEST 31 *** INIT - rtems_timer_create - creating timer 1 INIT - timer 1 has id (0x14010001) +INIT - rtems_timer_create - creating timer 2 +INIT - timer 2 has id (0x14010002) TA1 - rtems_timer_ident - identing timer 1 TA1 - timer 1 has id (0x14010001) -TA1 - rtems_clock_get - 09:00:00 12/31/1988 +TA1 - rtems_timer_ident - identing timer 2 +TA1 - timer 2 has id (0x14010002) +TA1 - rtems_timer_server_fire_after - 1 second +TA1 - rtems_task_wake_after - 1/2 second +TA1 - rtems_timer_server_fire_after - timer 2 in 1/2 second +TA1 - rtems_timer_cancel - timer 1 +TA1 - rtems_timer_cancel - timer 2 +TA1 - rtems_timer_server_fire_after - timer 1 in 30 seconds +TA1 - rtems_timer_server_fire_after - timer 2 in 60 seconds +Timer 1 scheduled for 3050 ticks since boot +Timer Server scheduled for 3050 ticks since boot +TA1 - rtems_task_wake_after - 1 second +TA1 - rtems_timer_server_fire_after - timer 2 in 60 seconds +Timer 1 scheduled for 3050 ticks since boot +Timer Server scheduled for 3050 ticks since boot +TA1 - rtems_task_wake_after - 1 second +TA1 - rtems_timer_server_fire_after - timer 2 in 60 seconds +Timer 1 scheduled for 3050 ticks since boot +Timer Server scheduled for 3050 ticks since boot +TA1 - rtems_timer_cancel - timer 1 +TA1 - rtems_timer_cancel - timer 2 +TA1 - rtems_clock_get - 09:00:02 12/31/1988 TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds TA1 - rtems_task_suspend( RTEMS_SELF ) -TA1 - rtems_clock_get - 09:00:03 12/31/1988 +TA1 - rtems_clock_get - 09:00:05 12/31/1988 TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds TA1 - rtems_task_wake_after - 1 second -TA1 - rtems_clock_get - 09:00:04 12/31/1988 +TA1 - rtems_clock_get - 09:00:06 12/31/1988 TA1 - rtems_timer_reset - timer 1 TA1 - rtems_task_suspend( RTEMS_SELF ) -TA1 - rtems_clock_get - 09:00:07 12/31/1988 +TA1 - rtems_clock_get - 09:00:09 12/31/1988 TA1 - rtems_timer_server_fire_after - timer 1 in 3 seconds TA1 - rtems_timer_cancel - timer 1 @@ -26,4 +49,4 @@ TA1 - rtems_clock_get - 09:00:11 12/31/1988 TA1 - rtems_timer_cancel - timer 1 TA1 - rtems_task_wake_after - YIELD (only task at priority) TA1 - timer_deleting - timer 1 -*** END OF TEST 31 *** +*** END OF TEST 31 *** -- cgit v1.2.3