From bf2a53d272107b8b224b1a48694da24d2d042442 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Sat, 14 Oct 2017 15:14:53 +0200
Subject: score: Rename watchdog variants

Rename PER_CPU_WATCHDOG_RELATIVE in PER_CPU_WATCHDOG_MONOTONIC to
highlight the corresponding POSIX CLOCK_MONOTONIC.

Rename PER_CPU_WATCHDOG_ABSOLUTE in PER_CPU_WATCHDOG_REALTIME to
highlight the corresponding POSIX CLOCK_REALTIME.

Update #3117.
Update #3182.
---
 cpukit/rtems/src/eventseize.c     | 2 +-
 cpukit/rtems/src/ratemoncancel.c  | 2 +-
 cpukit/rtems/src/ratemonperiod.c  | 2 +-
 cpukit/rtems/src/ratemontimeout.c | 2 +-
 cpukit/rtems/src/taskwakeafter.c  | 2 +-
 cpukit/rtems/src/taskwakewhen.c   | 2 +-
 cpukit/rtems/src/timercreate.c    | 6 +++---
 cpukit/rtems/src/timerreset.c     | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'cpukit/rtems/src')

diff --git a/cpukit/rtems/src/eventseize.c b/cpukit/rtems/src/eventseize.c
index 696481c2f5..76f9356800 100644
--- a/cpukit/rtems/src/eventseize.c
+++ b/cpukit/rtems/src/eventseize.c
@@ -81,7 +81,7 @@ rtems_status_code _Event_Seize(
   _Thread_Wait_release_default( executing, lock_context );
 
   if ( ticks ) {
-    _Thread_Timer_insert_relative(
+    _Thread_Timer_insert_monotonic(
       executing,
       cpu_self,
       _Thread_Timeout,
diff --git a/cpukit/rtems/src/ratemoncancel.c b/cpukit/rtems/src/ratemoncancel.c
index cb95f54408..0a88310d09 100644
--- a/cpukit/rtems/src/ratemoncancel.c
+++ b/cpukit/rtems/src/ratemoncancel.c
@@ -32,7 +32,7 @@ void _Rate_monotonic_Cancel(
 
   _Rate_monotonic_Acquire_critical( the_period, lock_context );
 
-  _Watchdog_Per_CPU_remove_relative( &the_period->Timer );
+  _Watchdog_Per_CPU_remove_monotonic( &the_period->Timer );
   the_period->state = RATE_MONOTONIC_INACTIVE;
   _Scheduler_Cancel_job(
     the_period->owner,
diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c
index efcd121584..511e46c21b 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_relative(
+  deadline = _Watchdog_Per_CPU_insert_monotonic(
     &the_period->Timer,
     cpu_self,
     next_length
diff --git a/cpukit/rtems/src/ratemontimeout.c b/cpukit/rtems/src/ratemontimeout.c
index 5a838fd916..b920c48789 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_relative(
+  deadline = _Watchdog_Per_CPU_insert_monotonic(
     &the_period->Timer,
     _Per_CPU_Get(),
     the_period->next_length
diff --git a/cpukit/rtems/src/taskwakeafter.c b/cpukit/rtems/src/taskwakeafter.c
index faf4a835cd..43bf612f61 100644
--- a/cpukit/rtems/src/taskwakeafter.c
+++ b/cpukit/rtems/src/taskwakeafter.c
@@ -41,7 +41,7 @@ rtems_status_code rtems_task_wake_after(
     } else {
       _Thread_Set_state( executing, STATES_WAITING_FOR_TIME );
       _Thread_Wait_flags_set( executing, THREAD_WAIT_STATE_BLOCKED );
-      _Thread_Timer_insert_relative(
+      _Thread_Timer_insert_monotonic(
         executing,
         cpu_self,
         _Thread_Timeout,
diff --git a/cpukit/rtems/src/taskwakewhen.c b/cpukit/rtems/src/taskwakewhen.c
index 5d6d45afcf..ac92ea875e 100644
--- a/cpukit/rtems/src/taskwakewhen.c
+++ b/cpukit/rtems/src/taskwakewhen.c
@@ -52,7 +52,7 @@ rtems_status_code rtems_task_wake_when(
     executing = _Thread_Executing;
     _Thread_Set_state( executing, STATES_WAITING_FOR_TIME );
     _Thread_Wait_flags_set( executing, THREAD_WAIT_STATE_BLOCKED );
-    _Thread_Timer_insert_absolute(
+    _Thread_Timer_insert_realtime(
       executing,
       cpu_self,
       _Thread_Timeout,
diff --git a/cpukit/rtems/src/timercreate.c b/cpukit/rtems/src/timercreate.c
index fc6d43e6dc..444b07cfa5 100644
--- a/cpukit/rtems/src/timercreate.c
+++ b/cpukit/rtems/src/timercreate.c
@@ -29,7 +29,7 @@
 #include <rtems/score/watchdogimpl.h>
 
 RTEMS_STATIC_ASSERT(
-  PER_CPU_WATCHDOG_ABSOLUTE == TIMER_CLASS_BIT_TIME_OF_DAY,
+  PER_CPU_WATCHDOG_REALTIME == TIMER_CLASS_BIT_TIME_OF_DAY,
   TIMER_CLASS_BIT_TIME_OF_DAY
 );
 
@@ -72,13 +72,13 @@ rtems_status_code _Timer_Fire(
 
     if ( _Timer_Is_interval_class( the_class ) ) {
       _Watchdog_Insert(
-        &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ],
+        &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ],
         &the_timer->Ticker,
         cpu->Watchdog.ticks + interval
       );
     } else {
       _Watchdog_Insert(
-        &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_ABSOLUTE ],
+        &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_REALTIME ],
         &the_timer->Ticker,
         _Watchdog_Ticks_from_seconds( interval )
       );
diff --git a/cpukit/rtems/src/timerreset.c b/cpukit/rtems/src/timerreset.c
index a4090152b3..3718fffa66 100644
--- a/cpukit/rtems/src/timerreset.c
+++ b/cpukit/rtems/src/timerreset.c
@@ -37,7 +37,7 @@ rtems_status_code rtems_timer_reset(
     if ( _Timer_Is_interval_class( the_timer->the_class ) ) {
       _Timer_Cancel( cpu, the_timer );
       _Watchdog_Insert(
-        &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_RELATIVE ],
+        &cpu->Watchdog.Header[ PER_CPU_WATCHDOG_MONOTONIC ],
         &the_timer->Ticker,
         cpu->Watchdog.ticks + the_timer->initial
       );
-- 
cgit v1.2.3