rtems: Rework rate-monotonic scheduler

Use the default thread lock to protect rate-monotonic state changes.
This avoids use of the Giant lock.  Split rtems_rate_monotonic_period()
body into several static functions.  Introduce a new thread wait class
THREAD_WAIT_CLASS_PERIOD for period objects to synchronize the blocking
operation.

Close #2631.

1 files changed, 26 insertions, 35 deletions

diff --git a/cpukit/rtems/src/ratemongetstatistics.c b/cpukit/rtems/src/ratemongetstatistics.c
index 6644562ba0..a6a0525fb0 100644
--- a/cpukit/rtems/src/ratemongetstatistics.c
+++ b/cpukit/rtems/src/ratemongetstatistics.c
@@ -8,6 +8,7 @@
 /*
  *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
+ *  Copyright (c) 2016 embedded brains GmbH.
  *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
@@ -18,50 +19,40 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/score/isr.h>
 #include <rtems/rtems/ratemonimpl.h>
-#include <rtems/score/thread.h>
 
 rtems_status_code rtems_rate_monotonic_get_statistics(
   rtems_id                                id,
-  rtems_rate_monotonic_period_statistics *statistics
+  rtems_rate_monotonic_period_statistics *dst
 )
 {
-  Objects_Locations                        location;
-  Rate_monotonic_Control                  *the_period;
-  rtems_rate_monotonic_period_statistics  *dst;
-  Rate_monotonic_Statistics               *src;
+  Rate_monotonic_Control          *the_period;
+  ISR_lock_Context                 lock_context;
+  Thread_Control                  *owner;
+  const Rate_monotonic_Statistics *src;
 
-  if ( !statistics )
+  if ( dst == NULL ) {
     return RTEMS_INVALID_ADDRESS;
+  }
 
-  the_period = _Rate_monotonic_Get( id, &location );
-  switch ( location ) {
-
-    case OBJECTS_LOCAL:
-      dst = statistics;
-      src = &the_period->Statistics;
-      dst->count        = src->count;
-      dst->missed_count = src->missed_count;
-      _Timestamp_To_timespec( &src->min_cpu_time,   &dst->min_cpu_time );
-      _Timestamp_To_timespec( &src->max_cpu_time,   &dst->max_cpu_time );
-      _Timestamp_To_timespec( &src->total_cpu_time, &dst->total_cpu_time );
-      _Timestamp_To_timespec( &src->min_wall_time,   &dst->min_wall_time );
-      _Timestamp_To_timespec( &src->max_wall_time,   &dst->max_wall_time );
-      _Timestamp_To_timespec( &src->total_wall_time, &dst->total_wall_time );
-
-      _Objects_Put( &the_period->Object );
-      return RTEMS_SUCCESSFUL;
-
-#if defined(RTEMS_MULTIPROCESSING)
-    case OBJECTS_REMOTE:            /* should never return this */
-#endif
-    case OBJECTS_ERROR:
-      break;
+  the_period = _Rate_monotonic_Get( id, &lock_context );
+  if ( the_period == NULL ) {
+    return RTEMS_INVALID_ID;
   }
 
-  return RTEMS_INVALID_ID;
+  owner = the_period->owner;
+  _Rate_monotonic_Acquire_critical( owner, &lock_context );
+
+  src = &the_period->Statistics;
+  dst->count        = src->count;
+  dst->missed_count = src->missed_count;
+  _Timestamp_To_timespec( &src->min_cpu_time,    &dst->min_cpu_time );
+  _Timestamp_To_timespec( &src->max_cpu_time,    &dst->max_cpu_time );
+  _Timestamp_To_timespec( &src->total_cpu_time,  &dst->total_cpu_time );
+  _Timestamp_To_timespec( &src->min_wall_time,   &dst->min_wall_time );
+  _Timestamp_To_timespec( &src->max_wall_time,   &dst->max_wall_time );
+  _Timestamp_To_timespec( &src->total_wall_time, &dst->total_wall_time );
+
+  _Rate_monotonic_Release( owner, &lock_context );
+  return RTEMS_SUCCESSFUL;
 }