2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>

* tm01/Makefile.am, tm01/task1.c, tm02/Makefile.am, tm02/task1.c,
	tm03/Makefile.am, tm03/task1.c, tm04/Makefile.am, tm04/task1.c,
	tm05/Makefile.am, tm05/task1.c, tm06/Makefile.am, tm06/task1.c,
	tm07/Makefile.am, tm07/task1.c, tm08/Makefile.am, tm08/task1.c,
	tm09/Makefile.am, tm09/task1.c, tm10/Makefile.am, tm10/task1.c,
	tm11/Makefile.am, tm11/task1.c, tm12/Makefile.am, tm12/task1.c,
	tm13/Makefile.am, tm13/task1.c, tm14/Makefile.am, tm14/task1.c,
	tm15/Makefile.am, tm15/task1.c, tm16/Makefile.am, tm16/task1.c,
	tm17/Makefile.am, tm17/task1.c, tm18/Makefile.am, tm18/task1.c,
	tm19/Makefile.am, tm19/task1.c, tm20/Makefile.am, tm20/task1.c,
	tm21/Makefile.am, tm21/task1.c, tm22/Makefile.am, tm22/task1.c,
	tm23/Makefile.am, tm23/task1.c, tm24/Makefile.am, tm24/task1.c,
	tm25/Makefile.am, tm25/task1.c, tm26/Makefile.am, tm26/task1.c,
	tm27/Makefile.am, tm27/task1.c, tm28/Makefile.am, tm28/task1.c,
	tm29/Makefile.am, tm29/task1.c, tmck/Makefile.am, tmck/task1.c,
	tmoverhd/Makefile.am, tmoverhd/testtask.c: Eliminate empty function
	from every benchmark timer driver. Fix spelling.

testsuites/tmtests/ChangeLog

@@ -1,3 +1,23 @@
+2008-08-31	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* tm01/Makefile.am, tm01/task1.c, tm02/Makefile.am, tm02/task1.c,
+	tm03/Makefile.am, tm03/task1.c, tm04/Makefile.am, tm04/task1.c,
+	tm05/Makefile.am, tm05/task1.c, tm06/Makefile.am, tm06/task1.c,
+	tm07/Makefile.am, tm07/task1.c, tm08/Makefile.am, tm08/task1.c,
+	tm09/Makefile.am, tm09/task1.c, tm10/Makefile.am, tm10/task1.c,
+	tm11/Makefile.am, tm11/task1.c, tm12/Makefile.am, tm12/task1.c,
+	tm13/Makefile.am, tm13/task1.c, tm14/Makefile.am, tm14/task1.c,
+	tm15/Makefile.am, tm15/task1.c, tm16/Makefile.am, tm16/task1.c,
+	tm17/Makefile.am, tm17/task1.c, tm18/Makefile.am, tm18/task1.c,
+	tm19/Makefile.am, tm19/task1.c, tm20/Makefile.am, tm20/task1.c,
+	tm21/Makefile.am, tm21/task1.c, tm22/Makefile.am, tm22/task1.c,
+	tm23/Makefile.am, tm23/task1.c, tm24/Makefile.am, tm24/task1.c,
+	tm25/Makefile.am, tm25/task1.c, tm26/Makefile.am, tm26/task1.c,
+	tm27/Makefile.am, tm27/task1.c, tm28/Makefile.am, tm28/task1.c,
+	tm29/Makefile.am, tm29/task1.c, tmck/Makefile.am, tmck/task1.c,
+	tmoverhd/Makefile.am, tmoverhd/testtask.c: Eliminate empty function
+	from every benchmark timer driver. Fix spelling.
+
 2008-08-31	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* tm01/task1.c, tm02/task1.c, tm03/task1.c, tm04/task1.c, tm05/task1.c,

testsuites/tmtests/tm01/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm01.exe
-tm01_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm01_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm01.doc
 

testsuites/tmtests/tm01/task1.c

@@ -75,7 +75,7 @@ rtems_task Test_task(
 
   /* Time one invocation of rtems_semaphore_create */
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_semaphore_create(
       name,
       OPERATION_COUNT,
@@ -83,7 +83,7 @@ rtems_task Test_task(
       RTEMS_NO_PRIORITY,
       &smid
     );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
   put_time(
     "rtems_semaphore_create",
     end_time,
@@ -94,9 +94,9 @@ rtems_task Test_task(
 
   /* Time one invocation of rtems_semaphore_delete */
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_semaphore_delete( smid );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
   put_time(
     "rtems_semaphore_delete",
     end_time,
@@ -115,46 +115,46 @@ rtems_task Test_task(
 
   for ( iterations=OPERATION_COUNT ; iterations ; iterations-- ) {
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
-        (void) benchmark_timerempty_function();
-    end_time = benchmark_timerread();
+        (void) benchmark_timer_empty_function();
+    end_time = benchmark_timer_read();
 
     semaphore_obtain_loop_time  += end_time;
     semaphore_release_loop_time += end_time;
 
     /* rtems_semaphore_obtain (available) */
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
         (void) rtems_semaphore_obtain(
           smid,
           RTEMS_DEFAULT_OPTIONS,
           RTEMS_NO_TIMEOUT
         );
-    end_time = benchmark_timerread();
+    end_time = benchmark_timer_read();
 
     semaphore_obtain_time += end_time;
 
     /* rtems_semaphore_release */
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
         (void) rtems_semaphore_release( smid );
-    end_time = benchmark_timerread();
+    end_time = benchmark_timer_read();
 
     semaphore_release_time += end_time;
 
     /* semaphore obtain (RTEMS_NO_WAIT) */
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
         rtems_semaphore_obtain( smid, RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT );
-    semaphore_obtain_no_wait_time += benchmark_timerread();
+    semaphore_obtain_no_wait_time += benchmark_timer_read();
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
         rtems_semaphore_release( smid );
-    end_time = benchmark_timerread();
+    end_time = benchmark_timer_read();
 
     semaphore_release_time += end_time;
   }

testsuites/tmtests/tm02/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm02.exe
-tm02_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm02_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm02.doc
 

testsuites/tmtests/tm02/task1.c

@@ -117,7 +117,7 @@ rtems_task High_task(
 {
   rtems_status_code status;
 
-  benchmark_timerinitialize();           /* start blocking rtems_semaphore_obtain time */
+  benchmark_timer_initialize();           /* start blocking rtems_semaphore_obtain time */
   status = rtems_semaphore_obtain(
     Semaphore_id,
     RTEMS_DEFAULT_OPTIONS,
@@ -142,7 +142,7 @@ rtems_task Low_task(
   rtems_task_argument argument
 )
 {
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_semaphore_obtain: not available -- caller blocks",

testsuites/tmtests/tm03/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm03.exe
-tm03_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm03_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm03.doc
 

testsuites/tmtests/tm03/task1.c

@@ -104,7 +104,7 @@ rtems_task test_init(
   status = rtems_task_start( task_id, High_task, 0 );
   directive_failed( status, "rtems_task_start of high task" );
 
-  benchmark_timerinitialize();                          /* start the timer */
+  benchmark_timer_initialize();                          /* start the timer */
   status = rtems_semaphore_release( Semaphore_id );
 }
 
@@ -135,7 +135,7 @@ rtems_task High_task(
     RTEMS_NO_TIMEOUT
   );
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_semaphore_release: task readied -- preempts caller",

testsuites/tmtests/tm04/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm04.exe
-tm04_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm04_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm04.doc
 

testsuites/tmtests/tm04/task1.c

@@ -90,7 +90,7 @@ rtems_task Highest_task(
 
   if ( argument == 1 ) {
 
-    end_time = benchmark_timerread();
+    end_time = benchmark_timer_read();
 
     put_time(
       "rtems_task_restart: blocked task -- preempts caller",
@@ -109,7 +109,7 @@ rtems_task Highest_task(
 
  } else if ( argument == 2 ) {
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
     put_time(
       "rtems_task_restart: ready task -- preempts caller",
@@ -140,23 +140,23 @@ rtems_task High_task(
   rtems_name          name;
   rtems_task_priority old_priority;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_task_restart( Highest_id, 1 );
   /* preempted by Higher_task */
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_task_restart( Highest_id, 2 );
   /* preempted by Higher_task */
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       rtems_semaphore_release( Semaphore_id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_semaphore_release: task readied -- returns to caller",
@@ -173,7 +173,7 @@ rtems_task High_task(
     directive_failed( status, "rtems_task_delete" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
      rtems_task_create(
         name,
@@ -183,7 +183,7 @@ rtems_task High_task(
         RTEMS_DEFAULT_ATTRIBUTES,
         &Task_id[ index ]
       );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_create",
@@ -193,11 +193,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TASK_CREATE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       rtems_task_start( Task_id[ index ], Low_tasks, 0 );
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_start",
@@ -230,10 +230,10 @@ rtems_task High_task(
     directive_failed( status, "rtems_task_suspend LOOP" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_restart( Task_id[ index ], 0 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_restart: suspended task -- returns to caller",
@@ -246,10 +246,10 @@ rtems_task High_task(
   for ( index=1 ; index <= OPERATION_COUNT ; index++ )
     (void) rtems_task_suspend( Task_id[ index ] );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_delete( Task_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_delete: suspended task",
@@ -274,10 +274,10 @@ rtems_task High_task(
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_restart( Task_id[ index ], 1 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_restart: ready task -- returns to caller",
@@ -296,10 +296,10 @@ rtems_task High_task(
   status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
   directive_failed( status, "rtems_task_wake_after" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_restart( Task_id[ index ], 1 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_restart: blocked task -- returns to caller",
@@ -313,10 +313,10 @@ rtems_task High_task(
   status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
   directive_failed( status, "rtems_task_wake_after" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_delete( Task_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_delete: blocked task",

testsuites/tmtests/tm05/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm05.exe
-tm05_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm05_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm05.doc
 

testsuites/tmtests/tm05/task1.c

@@ -82,11 +82,11 @@ rtems_task High_task(
   rtems_task_argument argument
 )
 {
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
 
   (void) rtems_task_suspend( RTEMS_SELF );
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_resume: task readied -- preempts caller",
@@ -115,7 +115,7 @@ rtems_task Low_task(
 )
 {
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_suspend: calling task",
@@ -126,6 +126,6 @@ rtems_task Low_task(
   );
 
   Task_index = 1;
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   (void) rtems_task_resume( Task_id[ Task_index ] );
 }

testsuites/tmtests/tm06/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm06.exe
-tm06_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm06_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm06.doc
 

testsuites/tmtests/tm06/task1.c

@@ -72,19 +72,19 @@ rtems_task Task_1(
   uint32_t    index;
 
   if ( Task_restarted == OPERATION_COUNT )
-     benchmark_timerinitialize();
+     benchmark_timer_initialize();
 
   Task_restarted--;
 
   if ( Task_restarted != 0 )
     (void) rtems_task_restart( RTEMS_SELF, 0 );
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
   put_time(
     "rtems_task_restart: calling task",
@@ -109,10 +109,10 @@ rtems_task Task_1(
     directive_failed( status, "rtems_task_start loop" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_suspend( Task_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_suspend: returns to caller",
@@ -122,10 +122,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TASK_SUSPEND
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_resume( Task_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_resume: task readied -- returns to caller",
@@ -135,10 +135,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TASK_RESUME
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_delete( Task_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_delete: ready task",

testsuites/tmtests/tm07/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm07.exe
-tm07_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm07_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm07.doc
 

testsuites/tmtests/tm07/task1.c

@@ -80,7 +80,7 @@ rtems_task High_task(
 )
 {
   if ( argument != 0 ) {
-    end_time = benchmark_timerread();
+    end_time = benchmark_timer_read();
 
     put_time(
       "rtems_task_restart: suspended task -- preempts caller",
@@ -114,6 +114,6 @@ rtems_task Low_task(
 {
   task_index = 1;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   (void) rtems_task_restart( Task_id[ task_index ], 0xffffffff );
 }

testsuites/tmtests/tm08/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm08.exe
-tm08_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm08_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm08.doc
 

testsuites/tmtests/tm08/task1.c

@@ -81,19 +81,19 @@ rtems_task test_task(
   uint32_t      old_note;
   uint32_t      old_mode;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_set_priority(
                Test_task_id,
                RTEMS_CURRENT_PRIORITY,
                &old_priority
              );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_set_priority: obtain current priority",
@@ -103,10 +103,10 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_SET_PRIORITY
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_set_priority( Test_task_id, 253, &old_priority );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_set_priority: returns to caller",
@@ -116,14 +116,14 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_SET_PRIORITY
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_mode(
         RTEMS_CURRENT_MODE,
         RTEMS_CURRENT_MODE,
         &old_mode
       );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_mode: obtain current mode",
@@ -133,7 +133,7 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_MODE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
       (void) rtems_task_mode(
         RTEMS_INTERRUPT_LEVEL(1),
@@ -146,7 +146,7 @@ rtems_task test_task(
         &old_mode
       );
     }
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_mode: no reschedule",
@@ -156,9 +156,9 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_MODE
   );
 
-  benchmark_timerinitialize();                 /* must be one host */
+  benchmark_timer_initialize();                 /* must be one host */
     (void) rtems_task_mode( RTEMS_NO_ASR, RTEMS_ASR_MASK, &old_mode );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_mode: reschedule -- returns to caller",
@@ -175,13 +175,13 @@ rtems_task test_task(
   directive_failed( status, "rtems_task_set_priority" );
 
   /* preempted by test_task1 */
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void)  rtems_task_mode( RTEMS_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_set_note( Test_task_id, 8, 10 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_set_note",
@@ -191,10 +191,10 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_SET_NOTE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_get_note( Test_task_id, 8, &old_note );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_get_note",
@@ -206,10 +206,10 @@ rtems_task test_task(
 
   build_time( &time, 1, 1, 1988, 0, 0, 0, 0 );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_clock_set( &time );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_clock_set",
@@ -219,10 +219,10 @@ rtems_task test_task(
     CALLING_OVERHEAD_CLOCK_SET
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_clock_get",
@@ -240,7 +240,7 @@ rtems_task test_task1(
   rtems_task_argument argument
 )
 {
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_mode: reschedule -- preempts caller",

testsuites/tmtests/tm09/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = tm09.exe
-tm09_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm09_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm09.doc
 

testsuites/tmtests/tm09/task1.c

@@ -53,7 +53,7 @@ rtems_task Test_task (
   rtems_task_argument argument
 )
 {
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     rtems_message_queue_create(
       1,
       OPERATION_COUNT,
@@ -61,7 +61,7 @@ rtems_task Test_task (
       RTEMS_DEFAULT_ATTRIBUTES,
       &Queue_id
     );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_create",
@@ -73,9 +73,9 @@ rtems_task Test_task (
 
   queue_test();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     rtems_message_queue_delete( Queue_id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_delete",
@@ -120,27 +120,27 @@ void queue_test()
 
   for ( iterations = 1 ; iterations <= OPERATION_COUNT ; iterations++ ) {
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) benchmark_timerempty_function();
-    send_loop_time += benchmark_timerread();
+        (void) benchmark_timer_empty_function();
+    send_loop_time += benchmark_timer_read();
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) benchmark_timerempty_function();
-    urgent_loop_time += benchmark_timerread();
+        (void) benchmark_timer_empty_function();
+    urgent_loop_time += benchmark_timer_read();
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) benchmark_timerempty_function();
-    receive_loop_time += benchmark_timerread();
+        (void) benchmark_timer_empty_function();
+    receive_loop_time += benchmark_timer_read();
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
         (void) rtems_message_queue_send( Queue_id, buffer, MESSAGE_SIZE );
-    send_time += benchmark_timerread();
+    send_time += benchmark_timer_read();
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
         (void) rtems_message_queue_receive(
                  Queue_id,
@@ -149,14 +149,14 @@ void queue_test()
                  RTEMS_DEFAULT_OPTIONS,
                  RTEMS_NO_TIMEOUT
                );
-    receive_time += benchmark_timerread();
+    receive_time += benchmark_timer_read();
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
         (void) rtems_message_queue_urgent( Queue_id, buffer, MESSAGE_SIZE );
-    urgent_time += benchmark_timerread();
+    urgent_time += benchmark_timer_read();
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
         (void) rtems_message_queue_receive(
                  Queue_id,
@@ -165,11 +165,11 @@ void queue_test()
                  RTEMS_DEFAULT_OPTIONS,
                  RTEMS_NO_TIMEOUT
                );
-    receive_time += benchmark_timerread();
+    receive_time += benchmark_timer_read();
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       rtems_message_queue_flush( Queue_id, &empty_flush_count );
-    empty_flush_time += benchmark_timerread();
+    empty_flush_time += benchmark_timer_read();
 
     /* send one message to flush */
     status = rtems_message_queue_send(
@@ -179,9 +179,9 @@ void queue_test()
     );
     directive_failed( status, "rtems_message_queue_send" );
 
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
       rtems_message_queue_flush( Queue_id, &flush_count );
-    flush_time += benchmark_timerread();
+    flush_time += benchmark_timer_read();
   }
 
   put_time(

testsuites/tmtests/tm10/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = tm10.exe
-tm10_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm10_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm10.doc
 

testsuites/tmtests/tm10/task1.c

@@ -87,12 +87,12 @@ void test_init()
   );
   directive_failed( status, "rtems_message_queue_create" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_receive(
                Queue_id,
@@ -101,7 +101,7 @@ void test_init()
                RTEMS_NO_WAIT,
                RTEMS_NO_TIMEOUT
              );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_receive: not available -- NO_WAIT",
@@ -119,7 +119,7 @@ rtems_task High_task(
 {
   size_t  size;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
      (void) rtems_message_queue_receive(
               Queue_id,
               (long (*)[4]) Buffer,
@@ -149,7 +149,7 @@ rtems_task Low_task(
   rtems_task_argument argument
 )
 {
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_receive: not available -- caller blocks",

testsuites/tmtests/tm11/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = tm11.exe
-tm11_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm11_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm11.doc
 

testsuites/tmtests/tm11/task1.c

@@ -106,7 +106,7 @@ rtems_task test_init(
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_message_queue_send( Queue_id, Buffer, MESSAGE_SIZE );
 }
 
@@ -141,7 +141,7 @@ rtems_task High_task(
            RTEMS_NO_TIMEOUT
          );
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_send: task readied -- preempts caller",

testsuites/tmtests/tm12/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = tm12.exe
-tm12_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm12_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm12.doc
 

testsuites/tmtests/tm12/task1.c

@@ -108,15 +108,15 @@ rtems_task High_task(
 {
   uint32_t    index;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_send( Queue_id, Buffer, MESSAGE_SIZE );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_send: task readied -- returns to caller",

testsuites/tmtests/tm13/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = tm13.exe
-tm13_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm13_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm13.doc
 

testsuites/tmtests/tm13/task1.c

@@ -105,7 +105,7 @@ rtems_task test_init(
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_message_queue_urgent( Queue_id, Buffer, MESSAGE_SIZE );
 }
 
@@ -140,7 +140,7 @@ rtems_task High_task(
            RTEMS_NO_TIMEOUT
          );
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_urgent: task readied -- preempts caller",

testsuites/tmtests/tm14/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = tm14.exe
-tm14_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm14_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm14.doc
 

testsuites/tmtests/tm14/task1.c

@@ -108,15 +108,15 @@ rtems_task High_task(
 {
   uint32_t    index;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_urgent( Queue_id, Buffer, MESSAGE_SIZE );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_urgent: task readied -- returns to caller",

testsuites/tmtests/tm15/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io event semaphore
 
 rtems_tests_PROGRAMS = tm15.exe
-tm15_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm15_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm15.doc
 

testsuites/tmtests/tm15/task1.c

@@ -78,12 +78,12 @@ void test_init()
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
     {
         (void) rtems_event_receive(
@@ -94,7 +94,7 @@ void test_init()
                );
     }
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_event_receive: obtain current events",
@@ -105,7 +105,7 @@ void test_init()
   );
 
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
     {
       (void) rtems_event_receive(
@@ -115,7 +115,7 @@ void test_init()
                &event_out
              );
     }
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_event_receive: not available -- NO_WAIT",
@@ -133,7 +133,7 @@ rtems_task Low_task(
   uint32_t    index;
   rtems_event_set   event_out;
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_event_receive: not available -- caller blocks",
@@ -143,15 +143,15 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_RECEIVE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_event_send( RTEMS_SELF, RTEMS_EVENT_16 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_event_send: no task readied",
@@ -161,14 +161,14 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_SEND
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_event_receive(
              RTEMS_EVENT_16,
              RTEMS_DEFAULT_OPTIONS,
              RTEMS_NO_TIMEOUT,
              &event_out
            );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_event_receive: available",
@@ -178,10 +178,10 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_RECEIVE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_event_send( Task_id[ index ], RTEMS_EVENT_16 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_event_send: task readied -- returns to caller",
@@ -210,7 +210,7 @@ rtems_task High_tasks(
     );
   else {
     time_set = 1;
-    benchmark_timerinitialize();            /* start blocking rtems_event_receive time */
+    benchmark_timer_initialize();            /* start blocking rtems_event_receive time */
     status = rtems_event_receive(
       RTEMS_EVENT_16,
       RTEMS_DEFAULT_OPTIONS,

testsuites/tmtests/tm16/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io event semaphore
 
 rtems_tests_PROGRAMS = tm16.exe
-tm16_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm16_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm16.doc
 

testsuites/tmtests/tm16/task1.c

@@ -93,7 +93,7 @@ rtems_task test_init(
 
   Task_count = 0;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_event_send( Task_id[ Task_count ], RTEMS_EVENT_16 );
   /* preempts task */
 }
@@ -132,7 +132,7 @@ rtems_task High_task(
             &event_out
           );
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_event_send: task readied -- preempts caller",

testsuites/tmtests/tm17/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm17.exe
-tm17_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm17_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm17.doc
 

testsuites/tmtests/tm17/task1.c

@@ -72,7 +72,7 @@ rtems_task First_task(
 {
   rtems_task_priority previous_priority;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
 
   Task_priority--;
   Task_count++;
@@ -106,12 +106,12 @@ rtems_task Last_task(
 {
   uint32_t   index;
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
   put_time(
     "rtems_task_set_priority: preempts caller",

testsuites/tmtests/tm18/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm18.exe
-tm18_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm18_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm18.doc
 

testsuites/tmtests/tm18/task1.c

@@ -80,7 +80,7 @@ rtems_task First_task(
   rtems_task_argument argument
 )
 {
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
 
   (void) rtems_task_delete( RTEMS_SELF );
 }
@@ -96,7 +96,7 @@ rtems_task Last_task(
   rtems_task_argument argument
 )
 {
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_delete: calling task",

testsuites/tmtests/tm19/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io signal semaphore
 
 rtems_tests_PROGRAMS = tm19.exe
-tm19_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm19_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm19.doc
 

testsuites/tmtests/tm19/task1.c

@@ -90,7 +90,7 @@ rtems_asr Process_asr_for_pass_1(
   rtems_signal_set signals
 )
 {
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_signal_send: signal to self",
@@ -100,7 +100,7 @@ rtems_asr Process_asr_for_pass_1(
     CALLING_OVERHEAD_SIGNAL_SEND
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
 }
 
 rtems_asr Process_asr_for_pass_2(
@@ -112,7 +112,7 @@ rtems_asr Process_asr_for_pass_2(
   status = rtems_task_resume( Task_id[ 3 ] );
   directive_failed( status, "rtems_task_resume" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
 }
 
 rtems_task Task_1(
@@ -121,9 +121,9 @@ rtems_task Task_1(
 {
   rtems_status_code status;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_signal_catch( Process_asr_for_pass_1, RTEMS_DEFAULT_MODES );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_signal_catch",
@@ -133,9 +133,9 @@ rtems_task Task_1(
     CALLING_OVERHEAD_SIGNAL_CATCH
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     rtems_signal_send( Task_id[ 2 ], 1 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_signal_send: returns to caller",
@@ -145,12 +145,12 @@ rtems_task Task_1(
     CALLING_OVERHEAD_SIGNAL_SEND
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_1 );
 
   /* end time is done is RTEMS_ASR */
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "exit ASR overhead: returns to calling task",
@@ -163,7 +163,7 @@ rtems_task Task_1(
   status = rtems_signal_catch( Process_asr_for_pass_2, RTEMS_NO_PREEMPT );
   directive_failed( status, "rtems_signal_catch" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_1 );
 }
 
@@ -192,7 +192,7 @@ rtems_task Task_3(
 {
   (void) rtems_task_suspend( RTEMS_SELF );
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "exit ASR overhead: returns to preempting task",

testsuites/tmtests/tm20/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io partition region semaphore
 
 rtems_tests_PROGRAMS = tm20.exe
-tm20_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm20_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm20.doc
 

testsuites/tmtests/tm20/task1.c

@@ -97,7 +97,7 @@ rtems_task Task_1(
 
   Partition_name = rtems_build_name( 'P', 'A', 'R', 'T' );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     rtems_partition_create(
       Partition_name,
       Partition_area,
@@ -106,7 +106,7 @@ rtems_task Task_1(
       RTEMS_DEFAULT_ATTRIBUTES,
       &Partition_id
     );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_partition_create",
@@ -118,7 +118,7 @@ rtems_task Task_1(
 
   Region_name = rtems_build_name( 'R', 'E', 'G', 'N' );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     rtems_region_create(
       Region_name,
       Region_area,
@@ -127,7 +127,7 @@ rtems_task Task_1(
       RTEMS_DEFAULT_ATTRIBUTES,
       &Region_id
     );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_region_create",
@@ -137,9 +137,9 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_CREATE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_partition_get_buffer( Partition_id, &Buffer_address_1 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_partition_get_buffer: available",
@@ -164,9 +164,9 @@ rtems_task Task_1(
     assert( buffer_count < PARTITION_BUFFER_POINTERS );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_partition_get_buffer( Partition_id, &Buffer_address_2 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_partition_get_buffer: not available",
@@ -176,9 +176,9 @@ rtems_task Task_1(
     CALLING_OVERHEAD_PARTITION_GET_BUFFER
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_partition_return_buffer( Partition_id, Buffer_address_1 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_partition_return_buffer",
@@ -198,9 +198,9 @@ rtems_task Task_1(
 
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_partition_delete( Partition_id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_partition_delete",
@@ -219,7 +219,7 @@ rtems_task Task_1(
            );
   directive_failed( status, "region_get_segment" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_region_get_segment(
       Region_id,
       400,
@@ -227,7 +227,7 @@ rtems_task Task_1(
       RTEMS_NO_TIMEOUT,
       &Buffer_address_3
     );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_region_get_segment: available",
@@ -237,7 +237,7 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_GET_SEGMENT
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_region_get_segment(
       Region_id,
       1998,
@@ -245,7 +245,7 @@ rtems_task Task_1(
       RTEMS_NO_TIMEOUT,
       &Buffer_address_4
     );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_region_get_segment: not available -- NO_WAIT",
@@ -258,9 +258,9 @@ rtems_task Task_1(
   status = rtems_region_return_segment( Region_id, Buffer_address_3 );
   directive_failed( status, "rtems_region_return_segment" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_region_return_segment( Region_id, Buffer_address_2 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_region_return_segment: no waiting tasks",
@@ -279,7 +279,7 @@ rtems_task Task_1(
   );
   directive_failed( status, "rtems_region_get_segment" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_region_get_segment(
       Region_id,
       1998,
@@ -290,7 +290,7 @@ rtems_task Task_1(
 
   /* execute Task_2 */
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_region_return_segment: task readied -- preempts caller",
@@ -336,9 +336,9 @@ rtems_task Task_1(
   status = rtems_region_return_segment( Region_id, Buffer_address_2 );
   directive_failed( status, "rtems_region_return_segment" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_region_delete( Region_id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_region_delete",
@@ -348,15 +348,15 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_DELETE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_initialize( _STUB_major, 0, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_io_initialize",
@@ -366,10 +366,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_INITIALIZE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_open( _STUB_major, 0, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_io_open",
@@ -379,10 +379,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_OPEN
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_close( _STUB_major, 0, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_io_close",
@@ -392,10 +392,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_CLOSE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_read( _STUB_major, 0, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_io_read",
@@ -405,10 +405,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_READ
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_write( _STUB_major, 0, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_io_write",
@@ -418,10 +418,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_WRITE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_control( _STUB_major, 0, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_io_control",
@@ -441,7 +441,7 @@ rtems_task Task_2(
 {
   rtems_status_code status;
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_region_get_segment: not available -- caller blocks",
@@ -451,14 +451,14 @@ rtems_task Task_2(
     CALLING_OVERHEAD_REGION_GET_SEGMENT
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_region_return_segment( Region_id, Buffer_address_1 );
 
   /* preempt back to Task_1 */
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_region_return_segment( Region_id, Buffer_address_1 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_region_return_segment: task readied -- returns to caller",

testsuites/tmtests/tm21/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io dpmem message partition region semaphore rate_monotonic timer
 
 rtems_tests_PROGRAMS = tm21.exe
-tm21_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm21_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm21.doc
 

testsuites/tmtests/tm21/task1.c

@@ -123,15 +123,15 @@ rtems_task Task_1(
     directive_failed( status, "rtems_rate_monotonic_create" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_ident",
@@ -141,10 +141,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TASK_IDENT
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_ident",
@@ -154,10 +154,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_MESSAGE_QUEUE_IDENT
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_semaphore_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_semaphore_ident",
@@ -167,10 +167,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_SEMAPHORE_IDENT
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_partition_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_partition_ident",
@@ -180,10 +180,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_PARTITION_IDENT
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_region_ident( index, &id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_region_ident",
@@ -193,10 +193,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_IDENT
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_port_ident( index, &id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_port_ident",
@@ -206,10 +206,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_PORT_IDENT
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_ident( index, &id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_ident",
@@ -219,10 +219,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TIMER_IDENT
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_rate_monotonic_ident( index, &id );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_rate_monotonic_ident",

testsuites/tmtests/tm22/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = tm22.exe
-tm22_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm22_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm22.doc
 

testsuites/tmtests/tm22/task1.c

@@ -88,14 +88,14 @@ rtems_task High_task(
   uint32_t    count;
   rtems_status_code status;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_message_queue_broadcast(
              Queue_id,
              Buffer,
              MESSAGE_SIZE,
              &count
            );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_broadcast: task readied -- returns to caller",
@@ -141,7 +141,7 @@ rtems_task Low_task(
   );
   directive_failed( status, "message_queu_receive" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_broadcast(
                Queue_id,
@@ -149,7 +149,7 @@ rtems_task Low_task(
                MESSAGE_SIZE,
                &count
              );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_broadcast: no waiting tasks",
@@ -169,7 +169,7 @@ rtems_task Low_task(
 
   /* should go to Preempt_task here */
 
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_message_queue_broadcast: task readied -- preempts caller",
@@ -189,7 +189,7 @@ rtems_task Preempt_task(
 {
   uint32_t    count;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_message_queue_broadcast(
              Queue_id,
              Buffer,

testsuites/tmtests/tm23/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io event timer semaphore
 
 rtems_tests_PROGRAMS = tm23.exe
-tm23_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm23_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm23.doc
 

testsuites/tmtests/tm23/task1.c

@@ -50,10 +50,10 @@ rtems_task Init(
 
   puts( "\n\n*** TIME TEST 23 ***" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
   priority = 5;
 
@@ -97,15 +97,15 @@ rtems_task High_task(
   rtems_status_code status;
   int i;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_create( index, &Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_create",
@@ -115,10 +115,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_CREATE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_after( Timer_id[ index ], 500, null_delay, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_fire_after: inactive",
@@ -128,10 +128,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_AFTER
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_after( Timer_id[ index ], 500, null_delay, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_fire_after: active",
@@ -141,10 +141,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_AFTER
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_cancel( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_cancel: active",
@@ -154,11 +154,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_CANCEL
   );
 
-  for ( benchmark_timerinitialize(), i=0 ; i<OPERATION_COUNT ; i++ )
-  benchmark_timerinitialize();
+  for ( benchmark_timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_cancel( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_cancel: inactive",
@@ -168,11 +168,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_CANCEL
   );
 
-  for ( benchmark_timerinitialize(), i=0 ; i<OPERATION_COUNT ; i++ )
-  benchmark_timerinitialize();
+  for ( benchmark_timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_reset( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_reset: inactive",
@@ -182,10 +182,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_RESET
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_reset( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_reset: active",
@@ -205,11 +205,11 @@ rtems_task High_task(
 
   time_of_day.year = 1989;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_when(
          Timer_id[ index ], &time_of_day, null_delay, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_fire_when: inactive",
@@ -219,11 +219,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_WHEN
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_when(
          Timer_id[ index ], &time_of_day, null_delay, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_fire_when: active",
@@ -233,10 +233,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_WHEN
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_delete( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_delete: active",
@@ -246,7 +246,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_DELETE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
     status = rtems_timer_create( index, &Timer_id[ index ] );
     directive_failed( status, "rtems_timer_create" );
@@ -258,10 +258,10 @@ rtems_task High_task(
     directive_failed( status, "rtems_timer_cancel" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_delete( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_delete: inactive",
@@ -271,7 +271,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_DELETE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_task_wake_when( &time_of_day );
 }
 
@@ -286,7 +286,7 @@ rtems_task Low_task(
   rtems_task_argument argument
 )
 {
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_wake_when",

testsuites/tmtests/tm24/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = tm24.exe
-tm24_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm24_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm24.doc
 

testsuites/tmtests/tm24/task1.c

@@ -73,15 +73,15 @@ rtems_task High_task(
   rtems_status_code status;
   uint32_t    index;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_wake_after: yield -- returns to caller",
@@ -104,9 +104,9 @@ rtems_task Tasks(
   Task_count++;
 
   if ( Task_count == 1 )
-    benchmark_timerinitialize();
+    benchmark_timer_initialize();
   else if ( Task_count == OPERATION_COUNT ) {
-    end_time = benchmark_timerread();
+    end_time = benchmark_timer_read();
 
     put_time(
       "rtems_task_wake_after: yields -- preempts caller",

testsuites/tmtests/tm25/Makefile.am

@@ -5,7 +5,8 @@
 MANAGERS = io semaphore semaphore
 
 rtems_tests_PROGRAMS = tm25.exe
-tm25_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm25_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm25.doc