2007-05-15 Joel Sherrill <joel.sherrill@oarcorp.com>

	* rtmonuse/init.c, rtmonuse/task1.c: Integrate Rate Monotonic
	Statistics and Period Usage into Rate Monotonic Manager. Added the
	following directives: rtems_rate_monotonic_get_statistics,
	rtems_rate_monotonic_reset_statistics,
	rtems_rate_montonic_reset_all_statistics,
	rtems_rate_montonic_report_statistics, and rtems_object_get_name.
	Obsoleted the rtems/rtmonuse.h file as a public interface.

2 files changed, 5 insertions, 12 deletions

diff --git a/testsuites/libtests/rtmonuse/init.c b/testsuites/libtests/rtmonuse/init.c
index a634e3f897..a0b9201393 100644
--- a/testsuites/libtests/rtmonuse/init.c
+++ b/testsuites/libtests/rtmonuse/init.c
@@ -11,7 +11,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -24,17 +24,14 @@
 #define TEST_INIT
 #include "system.h"
 
-#include <rtems/rtmonuse.h>
-
 rtems_task Init(
   rtems_task_argument argument
 )
 {
-  uint32_t    index;
+  uint32_t          index;
   rtems_status_code status;
 
   puts( "\n\n*** RATE MONOTONIC PERIOD STATISTICS TEST ***" );
-  Period_usage_Initialize();
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
   Task_name[ 2 ] =  rtems_build_name( 'T', 'A', '2', ' ' );
diff --git a/testsuites/libtests/rtmonuse/task1.c b/testsuites/libtests/rtmonuse/task1.c
index 3007baa56e..4e5bb1acff 100644
--- a/testsuites/libtests/rtmonuse/task1.c
+++ b/testsuites/libtests/rtmonuse/task1.c
@@ -8,7 +8,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -21,7 +21,6 @@
 #include "system.h"
 
 #include <rtems/cpuuse.h>
-#include <rtems/rtmonuse.h>
 
 uint32_t      Periods[6]    = { 0,   2,   2,   2,   2, 100 };
 uint32_t      Iterations[6] = { 0,  50,  50,  50,  50,   1 };
@@ -65,8 +64,6 @@ rtems_task Task_1_through_5(
     case 3:
     case 4:
       while ( FOREVER ) {
-        Period_usage_Update( rmid );
-
         status = rtems_rate_monotonic_period( rmid, Periods[ argument ] );
         directive_failed( status, "rtems_rate_monotonic_period" );
         Count.count[ argument ]++;
@@ -82,8 +79,6 @@ rtems_task Task_1_through_5(
       Get_all_counters();
 
       while ( FOREVER ) {
-        Period_usage_Update( rmid );
-
         status = rtems_rate_monotonic_period( rmid, Periods[ argument ] );
         directive_failed( status, "rtems_rate_monotonic_period 2 of TA5" );
 
@@ -113,7 +108,8 @@ rtems_task Task_1_through_5(
         if ( pass == 10 ) {
           puts( "*** END OF RATE MONOTONIC PERIOD STATISTICS TEST ***" );
           rtems_cpu_usage_report();
-          Period_usage_Dump();
+          rtems_rate_montonic_report_statistics();
+
           rtems_test_exit( 0 );
         }