From cb2cbecefdc124b010aa9d8714856332e3e3a759 Mon Sep 17 00:00:00 2001 From: Gedare Bloom Date: Fri, 13 Jan 2017 13:54:11 -0500 Subject: classic: adjust names of RM postponed job functions closes #2795 --- cpukit/rtems/include/rtems/rtems/ratemon.h | 4 ++-- cpukit/rtems/src/ratemonperiod.c | 19 ++++++++++++------- testsuites/sptests/spedfsched04/spedfsched04.doc | 6 +++--- testsuites/sptests/sprmsched01/sprmsched01.doc | 6 +++--- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h index 2eadfc2a7c..54ddd050e7 100644 --- a/cpukit/rtems/include/rtems/rtems/ratemon.h +++ b/cpukit/rtems/include/rtems/rtems/ratemon.h @@ -418,7 +418,7 @@ rtems_status_code rtems_rate_monotonic_period( ); /** - * @brief RTEMS Return the number of postponed jobs + * @brief Return the number of postponed jobs * * This is a helper function for runtime monitoring to return * the number of postponed jobs in this given period. This number @@ -431,7 +431,7 @@ rtems_status_code rtems_rate_monotonic_period( * jobs with a given period_id. * */ -uint32_t rtems_rate_monotonic_postponed_num( +uint32_t rtems_rate_monotonic_postponed_job_count( rtems_id period_id ); diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c index c98f37a3bd..128af57dee 100644 --- a/cpukit/rtems/src/ratemonperiod.c +++ b/cpukit/rtems/src/ratemonperiod.c @@ -64,7 +64,7 @@ bool _Rate_monotonic_Get_status( return true; } -static void _Rate_monotonic_Release_postponedjob( +static void _Rate_monotonic_Release_postponed_job( Rate_monotonic_Control *the_period, Thread_Control *owner, rtems_interval next_length, @@ -319,14 +319,19 @@ static rtems_status_code _Rate_monotonic_Block_while_expired( the_period->state = RATE_MONOTONIC_ACTIVE; the_period->next_length = length; - _Rate_monotonic_Release_postponedjob( the_period, executing, length, lock_context ); + _Rate_monotonic_Release_postponed_job( + the_period, + executing, + length, + lock_context + ); return RTEMS_TIMEOUT; } /* * This helper function is prepared for run-time monitoring. */ -uint32_t rtems_rate_monotonic_postponed_num( +uint32_t rtems_rate_monotonic_postponed_job_count( rtems_id period_id ) { @@ -381,8 +386,8 @@ rtems_status_code rtems_rate_monotonic_period( * previous postponed instance is finished without exceeding * the current period deadline. * - * Do nothing on the watchdog deadline assignment but release the next - * remaining postponed job. + * Do nothing on the watchdog deadline assignment but release the + * next remaining postponed job. */ status = _Rate_monotonic_Block_while_expired( the_period, @@ -392,8 +397,8 @@ rtems_status_code rtems_rate_monotonic_period( ); }else{ /* - * Normal case that no postponed jobs and no expiration, so wait for the period - * and update the deadline of watchdog accordingly. + * Normal case that no postponed jobs and no expiration, so wait for + * the period and update the deadline of watchdog accordingly. */ status = _Rate_monotonic_Block_while_active( the_period, diff --git a/testsuites/sptests/spedfsched04/spedfsched04.doc b/testsuites/sptests/spedfsched04/spedfsched04.doc index ffb4fc172a..f4b584682e 100644 --- a/testsuites/sptests/spedfsched04/spedfsched04.doc +++ b/testsuites/sptests/spedfsched04/spedfsched04.doc @@ -15,10 +15,10 @@ directives: - rtems_rate_monotonic_report_statistics() - rtems_rate_monotonic_period() - - rtems_rate_monotonic_Postponed_num() + - rtems_rate_monotonic_postponed_job_count() - _Rate_monotonic_Timeout() - _Rate_monotonic_Renew_deadline() - - _Rate_monotonic_Release_postponedjob() + - _Rate_monotonic_Release_postponed_job() - _Rate_monotonic_Block_while_expired() @@ -27,7 +27,7 @@ concepts: - Verify that watchdog deadline is renewed on time without shift via _Rate_monotonic_Renew_deadline(). - Verify that postponed jobs are released with a correct number via - _Rate_monotonic_Release_postponedjob(). + _Rate_monotonic_Release_postponed_job(). - Verify that rtems_rate_monotonic_report_statistics() reports correct number of deadline misses. - Verify that rtems_rate_monotonic_period() and diff --git a/testsuites/sptests/sprmsched01/sprmsched01.doc b/testsuites/sptests/sprmsched01/sprmsched01.doc index 3bf4e61c35..6893161478 100644 --- a/testsuites/sptests/sprmsched01/sprmsched01.doc +++ b/testsuites/sptests/sprmsched01/sprmsched01.doc @@ -14,10 +14,10 @@ directives: - rtems_rate_monotonic_report_statistics() - rtems_rate_monotonic_period() - - rtems_rate_monotonic_Postponed_num() + - rtems_rate_monotonic_postponed_job_count() - _Rate_monotonic_Timeout() - _Rate_monotonic_Renew_deadline() - - _Rate_monotonic_Release_postponedjob() + - _Rate_monotonic_Release_postponed_job() - _Rate_monotonic_Block_while_expired() @@ -26,7 +26,7 @@ concepts: - Verify that watchdog deadline is renewed on time without shift via _Rate_monotonic_Renew_deadline(). - Verify that postponed jobs are released with a correct number via - _Rate_monotonic_Release_postponedjob(). + _Rate_monotonic_Release_postponed_job(). - Verify that rtems_rate_monotonic_report_statistics() reports correct number of deadline misses. - Verify that rtems_rate_monotonic_period() and -- cgit v1.2.3