From 4074e70b0390d25b184b1187b8a8c59cf7ead79b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 31 Aug 2008 16:47:18 +0000 Subject: 2008-08-31 Joel Sherrill * tm01/task1.c, tm02/task1.c, tm03/task1.c, tm04/task1.c, tm05/task1.c, tm06/task1.c, tm07/task1.c, tm08/task1.c, tm09/task1.c, tm10/task1.c, tm11/task1.c, tm12/task1.c, tm13/task1.c, tm14/task1.c, tm15/task1.c, tm16/task1.c, tm17/task1.c, tm18/task1.c, tm19/task1.c, tm20/task1.c, tm21/task1.c, tm22/task1.c, tm23/task1.c, tm24/task1.c, tm25/task1.c, tm26/task1.c, tm27/task1.c, tm28/task1.c, tm29/task1.c, tmck/task1.c, tmoverhd/testtask.c: Rename timer driver methods to follow RTEMS programming conventions. --- testsuites/tmtests/tm26/task1.c | 86 ++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'testsuites/tmtests/tm26/task1.c') diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c index ee7c44f6c6..f67cf46fbb 100644 --- a/testsuites/tmtests/tm26/task1.c +++ b/testsuites/tmtests/tm26/task1.c @@ -194,33 +194,33 @@ rtems_task High_task( { rtems_interrupt_level level; - Timer_initialize(); + benchmark_timerinitialize(); rtems_interrupt_disable( level ); - isr_disable_time = Read_timer(); + isr_disable_time = benchmark_timerread(); - Timer_initialize(); + benchmark_timerinitialize(); rtems_interrupt_flash( level ); - isr_flash_time = Read_timer(); + isr_flash_time = benchmark_timerread(); - Timer_initialize(); + benchmark_timerinitialize(); rtems_interrupt_enable( level ); - isr_enable_time = Read_timer(); + isr_enable_time = benchmark_timerread(); - Timer_initialize(); + benchmark_timerinitialize(); _Thread_Disable_dispatch(); - thread_disable_dispatch_time = Read_timer(); + thread_disable_dispatch_time = benchmark_timerread(); - Timer_initialize(); + benchmark_timerinitialize(); _Thread_Enable_dispatch(); - thread_enable_dispatch_time = Read_timer(); + thread_enable_dispatch_time = benchmark_timerread(); - Timer_initialize(); + benchmark_timerinitialize(); _Thread_Set_state( _Thread_Executing, STATES_SUSPENDED ); - thread_set_state_time = Read_timer(); + thread_set_state_time = benchmark_timerread(); _Context_Switch_necessary = TRUE; - Timer_initialize(); + benchmark_timerinitialize(); _Thread_Dispatch(); /* dispatches Middle_task */ } @@ -228,7 +228,7 @@ rtems_task Middle_task( rtems_task_argument argument ) { - thread_dispatch_no_fp_time = Read_timer(); + thread_dispatch_no_fp_time = benchmark_timerread(); _Thread_Set_state( _Thread_Executing, STATES_SUSPENDED ); @@ -243,10 +243,10 @@ rtems_task Middle_task( _Thread_Disable_dispatch(); - Timer_initialize(); + benchmark_timerinitialize(); _Context_Switch( &Middle_tcb->Registers, &_Thread_Executing->Registers ); - Timer_initialize(); + benchmark_timerinitialize(); _Context_Switch(&Middle_tcb->Registers, &Low_tcb->Registers); } @@ -256,20 +256,20 @@ rtems_task Low_task( { Thread_Control *executing; - context_switch_no_fp_time = Read_timer(); + context_switch_no_fp_time = benchmark_timerread(); executing = _Thread_Executing; Low_tcb = executing; - Timer_initialize(); + benchmark_timerinitialize(); _Context_Switch( &executing->Registers, &executing->Registers ); - context_switch_self_time = Read_timer(); + context_switch_self_time = benchmark_timerread(); _Context_Switch(&executing->Registers, &Middle_tcb->Registers); - context_switch_another_task_time = Read_timer(); + context_switch_another_task_time = benchmark_timerread(); _Thread_Executing = (Thread_Control *) _Thread_Ready_chain[201].first; @@ -280,7 +280,7 @@ rtems_task Low_task( _Thread_Disable_dispatch(); - Timer_initialize(); + benchmark_timerinitialize(); #if (CPU_HARDWARE_FP == 1) || (CPU_SOFTWARE_FP == 1) _Context_Restore_fp( &_Thread_Executing->fp_context ); #endif @@ -294,7 +294,7 @@ rtems_task Floating_point_task_1( Thread_Control *executing; FP_DECLARE; - context_switch_restore_1st_fp_time = Read_timer(); + context_switch_restore_1st_fp_time = benchmark_timerread(); executing = _Thread_Executing; @@ -307,7 +307,7 @@ rtems_task Floating_point_task_1( _Thread_Disable_dispatch(); - Timer_initialize(); + benchmark_timerinitialize(); #if (CPU_HARDWARE_FP == 1) || (CPU_SOFTWARE_FP == 1) _Context_Save_fp( &executing->fp_context ); _Context_Restore_fp( &_Thread_Executing->fp_context ); @@ -315,7 +315,7 @@ rtems_task Floating_point_task_1( _Context_Switch( &executing->Registers, &_Thread_Executing->Registers ); /* switch to Floating_point_task_2 */ - context_switch_save_idle_restore_initted_time = Read_timer(); + context_switch_save_idle_restore_initted_time = benchmark_timerread(); FP_LOAD( 1.0 ); @@ -330,7 +330,7 @@ rtems_task Floating_point_task_1( _Thread_Disable_dispatch(); - Timer_initialize(); + benchmark_timerinitialize(); #if (CPU_HARDWARE_FP == 1) || (CPU_SOFTWARE_FP == 1) _Context_Save_fp( &executing->fp_context ); _Context_Restore_fp( &_Thread_Executing->fp_context ); @@ -346,7 +346,7 @@ rtems_task Floating_point_task_2( Thread_Control *executing; FP_DECLARE; - context_switch_save_restore_idle_time = Read_timer(); + context_switch_save_restore_idle_time = benchmark_timerread(); executing = _Thread_Executing; @@ -361,7 +361,7 @@ rtems_task Floating_point_task_2( _Thread_Disable_dispatch(); - Timer_initialize(); + benchmark_timerinitialize(); #if (CPU_HARDWARE_FP == 1) || (CPU_SOFTWARE_FP == 1) _Context_Save_fp( &executing->fp_context ); _Context_Restore_fp( &_Thread_Executing->fp_context ); @@ -369,7 +369,7 @@ rtems_task Floating_point_task_2( _Context_Switch( &executing->Registers, &_Thread_Executing->Registers ); /* switch to Floating_point_task_1 */ - context_switch_save_restore_initted_time = Read_timer(); + context_switch_save_restore_initted_time = benchmark_timerread(); complete_test(); } @@ -379,43 +379,43 @@ void complete_test( void ) uint32_t index; rtems_id task_id; - Timer_initialize(); + benchmark_timerinitialize(); _Thread_Resume( Middle_tcb, TRUE ); - thread_resume_time = Read_timer(); + thread_resume_time = benchmark_timerread(); _Thread_Set_state( Middle_tcb, STATES_WAITING_FOR_MESSAGE ); - Timer_initialize(); + benchmark_timerinitialize(); _Thread_Unblock( Middle_tcb ); - thread_unblock_time = Read_timer(); + thread_unblock_time = benchmark_timerread(); _Thread_Set_state( Middle_tcb, STATES_WAITING_FOR_MESSAGE ); - Timer_initialize(); + benchmark_timerinitialize(); _Thread_Ready( Middle_tcb ); - thread_ready_time = Read_timer(); + thread_ready_time = benchmark_timerread(); - Timer_initialize(); + benchmark_timerinitialize(); for ( index=1 ; index <= OPERATION_COUNT ; index++ ) - (void) Empty_function(); - overhead = Read_timer(); + (void) benchmark_timerempty_function(); + overhead = benchmark_timerread(); task_id = Middle_tcb->Object.id; - Timer_initialize(); + benchmark_timerinitialize(); for ( index=1 ; index <= OPERATION_COUNT ; index++ ) (void) _Thread_Get( task_id, &location ); - thread_get_time = Read_timer(); + thread_get_time = benchmark_timerread(); - Timer_initialize(); + benchmark_timerinitialize(); for ( index=1 ; index <= OPERATION_COUNT ; index++ ) (void) _Semaphore_Get( Semaphore_id, &location ); - semaphore_get_time = Read_timer(); + semaphore_get_time = benchmark_timerread(); - Timer_initialize(); + benchmark_timerinitialize(); for ( index=1 ; index <= OPERATION_COUNT ; index++ ) (void) _Thread_Get( 0x3, &location ); - thread_get_invalid_time = Read_timer(); + thread_get_invalid_time = benchmark_timerread(); /* * This is the running task and we have tricked RTEMS out enough where -- cgit v1.2.3