[rtems commit] score: Rename _Watchdog_Per_CPU_insert_monotonic()

Sebastian Huber sebh at rtems.org
Tue Oct 17 06:31:06 UTC 2017


Module:    rtems
Branch:    master
Commit:    91ce012ced085682e271af4bf33e112dc968d4b9
Changeset: http://git.rtems.org/rtems/commit/?id=91ce012ced085682e271af4bf33e112dc968d4b9

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Oct 16 09:32:37 2017 +0200

score: Rename _Watchdog_Per_CPU_insert_monotonic()

Rename _Watchdog_Per_CPU_insert_monotonic() in
_Watchdog_Per_CPU_insert_ticks().

Update #3117.
Update #3182.

---

 cpukit/posix/include/rtems/posix/pthreadimpl.h  | 2 +-
 cpukit/posix/src/ualarm.c                       | 2 +-
 cpukit/rtems/src/ratemonperiod.c                | 2 +-
 cpukit/rtems/src/ratemontimeout.c               | 2 +-
 cpukit/score/include/rtems/score/threadimpl.h   | 2 +-
 cpukit/score/include/rtems/score/watchdogimpl.h | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cpukit/posix/include/rtems/posix/pthreadimpl.h b/cpukit/posix/include/rtems/posix/pthreadimpl.h
index ddc5bb2..bae9e34 100644
--- a/cpukit/posix/include/rtems/posix/pthreadimpl.h
+++ b/cpukit/posix/include/rtems/posix/pthreadimpl.h
@@ -56,7 +56,7 @@ RTEMS_INLINE_ROUTINE void _POSIX_Threads_Sporadic_timer_insert(
   the_thread->cpu_time_budget =
     _Timespec_To_ticks( &api->schedparam.sched_ss_init_budget );
 
-  _Watchdog_Per_CPU_insert_monotonic(
+  _Watchdog_Per_CPU_insert_ticks(
     &api->Sporadic.Timer,
     _Per_CPU_Get(),
     _Timespec_To_ticks( &api->schedparam.sched_ss_repl_period )
diff --git a/cpukit/posix/src/ualarm.c b/cpukit/posix/src/ualarm.c
index 1626153..ead14d4 100644
--- a/cpukit/posix/src/ualarm.c
+++ b/cpukit/posix/src/ualarm.c
@@ -55,7 +55,7 @@ static void _POSIX_signals_Ualarm_TSR( Watchdog_Control *the_watchdog )
    * If the reset interval is non-zero, reschedule ourselves.
    */
   if ( _POSIX_signals_Ualarm_interval != 0 ) {
-    _Watchdog_Per_CPU_insert_monotonic(
+    _Watchdog_Per_CPU_insert_ticks(
       the_watchdog,
       _Per_CPU_Get(),
       _POSIX_signals_Ualarm_interval
diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c
index 511e46c..2e4e482 100644
--- a/cpukit/rtems/src/ratemonperiod.c
+++ b/cpukit/rtems/src/ratemonperiod.c
@@ -101,7 +101,7 @@ static void _Rate_monotonic_Release_job(
 
   cpu_self = _Thread_Dispatch_disable_critical( lock_context );
 
-  deadline = _Watchdog_Per_CPU_insert_monotonic(
+  deadline = _Watchdog_Per_CPU_insert_ticks(
     &the_period->Timer,
     cpu_self,
     next_length
diff --git a/cpukit/rtems/src/ratemontimeout.c b/cpukit/rtems/src/ratemontimeout.c
index b920c48..e2593f5 100644
--- a/cpukit/rtems/src/ratemontimeout.c
+++ b/cpukit/rtems/src/ratemontimeout.c
@@ -36,7 +36,7 @@ static void _Rate_monotonic_Renew_deadline(
 
   the_period->state = RATE_MONOTONIC_EXPIRED;
 
-  deadline = _Watchdog_Per_CPU_insert_monotonic(
+  deadline = _Watchdog_Per_CPU_insert_ticks(
     &the_period->Timer,
     _Per_CPU_Get(),
     the_period->next_length
diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h
index 67de07e..6e4c461 100644
--- a/cpukit/score/include/rtems/score/threadimpl.h
+++ b/cpukit/score/include/rtems/score/threadimpl.h
@@ -1871,7 +1871,7 @@ RTEMS_INLINE_ROUTINE void _Thread_Timer_insert_monotonic(
   the_thread->Timer.header =
     &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ];
   the_thread->Timer.Watchdog.routine = routine;
-  _Watchdog_Per_CPU_insert_monotonic( &the_thread->Timer.Watchdog, cpu, ticks );
+  _Watchdog_Per_CPU_insert_ticks( &the_thread->Timer.Watchdog, cpu, ticks );
 
   _ISR_lock_Release_and_ISR_enable( &the_thread->Timer.Lock, &lock_context );
 }
diff --git a/cpukit/score/include/rtems/score/watchdogimpl.h b/cpukit/score/include/rtems/score/watchdogimpl.h
index e248bcc..89a7e7d 100644
--- a/cpukit/score/include/rtems/score/watchdogimpl.h
+++ b/cpukit/score/include/rtems/score/watchdogimpl.h
@@ -351,7 +351,7 @@ RTEMS_INLINE_ROUTINE void _Watchdog_Per_CPU_release_critical(
   _ISR_lock_Release( &cpu->Watchdog.Lock, lock_context );
 }
 
-RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_monotonic(
+RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Per_CPU_insert_ticks(
   Watchdog_Control  *the_watchdog,
   Per_CPU_Control   *cpu,
   Watchdog_Interval  ticks




More information about the vc mailing list