diff options
Diffstat (limited to 'c/src/ada-tests/tmtests/tm29/tmtest.adb')
| -rw-r--r-- | c/src/ada-tests/tmtests/tm29/tmtest.adb | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/c/src/ada-tests/tmtests/tm29/tmtest.adb b/c/src/ada-tests/tmtests/tm29/tmtest.adb index b785fbeb39..9710fb32b9 100644 --- a/c/src/ada-tests/tmtests/tm29/tmtest.adb +++ b/c/src/ada-tests/tmtests/tm29/tmtest.adb @@ -10,7 +10,7 @@ -- -- -- --- COPYRIGHT (c) 1989-2009. +-- COPYRIGHT (c) 1989-2011. -- On-Line Applications Research Corporation (OAR). -- -- The license and distribution terms for this file may in @@ -26,16 +26,16 @@ with TEST_SUPPORT; with TEXT_IO; with TIME_TEST_SUPPORT; with TIMER_DRIVER; +with RTEMS.RATE_MONOTONIC; package body TMTEST is ---PAGE -- -- INIT -- procedure INIT ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.ID; @@ -48,7 +48,7 @@ package body TMTEST is TMTEST.PERIOD_NAME := RTEMS.BUILD_NAME( 'P', 'R', 'D', ' ' ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -60,8 +60,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 10, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); TIME_TEST_SUPPORT.PUT_TIME( "RATE_MONOTONIC_PERIOD (initial)", @@ -72,8 +73,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_PERIOD( ID, RTEMS.PERIOD_STATUS, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, RTEMS.RATE_MONOTONIC_PERIOD_STATUS, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); TIME_TEST_SUPPORT.PUT_TIME( "RATE_MONOTONIC_PERIOD (STATUS)", @@ -84,8 +86,9 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_CANCEL( ID, STATUS ); + RTEMS.RATE_MONOTONIC.CANCEL( ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CANCEL" ); TIME_TEST_SUPPORT.PUT_TIME( "RATE_MONOTONIC_CANCEL", @@ -96,7 +99,7 @@ package body TMTEST is ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_DELETE( ID, STATUS ); + RTEMS.RATE_MONOTONIC.DELETE( ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -107,14 +110,14 @@ package body TMTEST is RTEMS_CALLING_OVERHEAD.RATE_MONOTONIC_DELETE ); - RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_CREATE" ); - RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 10, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); TIMER_DRIVER.INITIALIZE; - RTEMS.RATE_MONOTONIC_DELETE( ID, STATUS ); + RTEMS.RATE_MONOTONIC.DELETE( ID, STATUS ); TMTEST.END_TIME := TIMER_DRIVER.READ_TIMER; TIME_TEST_SUPPORT.PUT_TIME( @@ -128,7 +131,7 @@ package body TMTEST is for INDEX in 1 .. TIME_TEST_SUPPORT.OPERATION_COUNT loop - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'T', 'E', 'S', 'T' ), 128, 1024, @@ -139,12 +142,12 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( ID, TMTEST.TASKS'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.TASKS'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); end loop; - RTEMS.TASK_CREATE( + RTEMS.TASKS.CREATE( RTEMS.BUILD_NAME( 'L', 'O', 'W', ' ' ), 200, 2048, @@ -155,37 +158,38 @@ package body TMTEST is ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE LOOP" ); - RTEMS.TASK_START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); + RTEMS.TASKS.START( ID, TMTEST.LOW_TASK'ACCESS, 0, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" ); TMTEST.TASK_COUNT := 0; - RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); + RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" ); end INIT; ---PAGE -- -- TASKS -- procedure TASKS ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); ID : RTEMS.NAME; STATUS : RTEMS.STATUS_CODES; begin - RTEMS.RATE_MONOTONIC_CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); - RTEMS.RATE_MONOTONIC_PERIOD( ID, 10, STATUS ); + RTEMS.RATE_MONOTONIC.CREATE( TMTEST.PERIOD_NAME, ID, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 10, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); -- Give up the processor to allow all tasks to actually -- create and start their period timer before the benchmark -- timer driver is initialized. - RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" ); TMTEST.TASK_COUNT := TMTEST.TASK_COUNT + 1; @@ -193,17 +197,17 @@ package body TMTEST is TIMER_DRIVER.INITIALIZE; end if; - RTEMS.RATE_MONOTONIC_PERIOD( ID, 100, STATUS ); + RTEMS.RATE_MONOTONIC.PERIOD( ID, 100, STATUS ); + TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "RATE_MONOTONIC_PERIOD" ); end TASKS; ---PAGE -- -- LOW_TASK -- procedure LOW_TASK ( - ARGUMENT : in RTEMS.TASK_ARGUMENT + ARGUMENT : in RTEMS.TASKS.ARGUMENT ) is pragma Unreferenced(ARGUMENT); OVERHEAD : RTEMS.UNSIGNED32; |