Changeset 875fff0a in rtems

Timestamp:

07/23/14 20:35:35 (8 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, 5, master

Children:

0a84c298

Parents:

3b6352d

git-author:

Joel Sherrill <joel.sherrill@…> (07/23/14 20:35:35)

git-committer:

Joel Sherrill <joel.sherrill@…> (07/23/14 21:53:24)

Message:

Add _TOD_Adjust to SCORE TOD Handler.

This lays the proper structure for doing future work on
time adjustment algorithms. Any TOD adjustments should be
requested at the API level and performed at the SCORE level.

Additionally updated a test.

Files:

• cpukit/posix/src/adjtime.c (modified) (3 diffs)
• cpukit/score/Makefile.am (modified) (1 diff)
• cpukit/score/include/rtems/score/todimpl.h (modified) (1 diff)
• cpukit/score/src/coretodadjust.c (added)
• testsuites/psxtests/psxtime/psxtime.scn (modified) (1 diff)
• testsuites/psxtests/psxtime/test.c (modified) (2 diffs)

cpukit/posix/src/adjtime.c

@@ -45 +45 @@
 {
   Timestamp_Control  delta_as_timestamp;
-  Timestamp_Control  tod_as_timestamp;
-  Timestamp_Control *tod_as_timestamp_ptr;
 
   /*
@@ -54 +52 @@
     rtems_set_errno_and_return_minus_one( EINVAL );
 
+  if ( delta->tv_usec >= TOD_MICROSECONDS_PER_SECOND )
+    rtems_set_errno_and_return_minus_one( EINVAL );
+
   /*
-   * Currently, RTEMS does the adjustment in one movement.
+   * An adjustment of zero is pretty easy.
+   */
+  if ( delta->tv_sec == 0 && delta->tv_usec == 0 )
+    return 0;
+
+  /*
+   * Currently, RTEMS does the adjustment in one movement so there
+   * is no way an adjustment was currently underway.
+   *
    * Given interest, requirements, and sponsorship, a future
    * enhancement would be to adjust the time in smaller increments
@@ -72 +81 @@
 
   /*
-   * This prevents context switches while we are adjusting the TOD
+   * Now apply the adjustment
    */
-
-  _Thread_Disable_dispatch();
-
-    tod_as_timestamp_ptr =
-      _TOD_Get_with_nanoseconds( &tod_as_timestamp, &_TOD.now );
-
-
-    _Timestamp_Add_to( tod_as_timestamp_ptr, &delta_as_timestamp );
-
-    _TOD_Set_with_timestamp( tod_as_timestamp_ptr );
-
-  _Thread_Enable_dispatch();
+  _TOD_Adjust( delta_as_timestamp );
 
   return 0;

cpukit/score/Makefile.am

@@ -320 +320 @@
 libscore_a_SOURCES += src/coretod.c src/coretodset.c src/coretodget.c \
     src/coretodgetuptimetimespec.c src/coretodtickle.c \
-    src/coretodsecondssinceepoch.c \
-    src/coretodtickspersec.c
+    src/coretodsecondssinceepoch.c src/coretodtickspersec.c \
+    src/coretodadjust.c
 
 ## WATCHDOG_C_FILES

cpukit/score/include/rtems/score/todimpl.h

@@ -323 +323 @@
 }
 
+/**
+ * @brief Adjust the Time of Time
+ *
+ * This method is used to adjust the current time of day by the
+ * specified amount.
+ *
+ * @param[in] delta is the amount to adjust
+ */
+void _TOD_Adjust(
+  const Timestamp_Control timestamp
+);
+
 RTEMS_INLINE_ROUTINE void _TOD_Set_nanoseconds_since_last_tick_handler(
   TOD_Nanoseconds_since_last_tick_routine routine

testsuites/psxtests/psxtime/psxtime.scn

@@ -6 +6 @@
 adjtime - NULL delta - EINVAL
 adjtime - delta out of range - EINVAL
+adjtime - delta range of 0 - OK
 adjtime - delta too small - do nothing
 adjtime - delta too small - do nothing, olddelta=NULL

testsuites/psxtests/psxtime/test.c

@@ -1 @@
-/*
- *  This test exercises the time of day services via the Classic
- *  and POSIX APIs to make sure they are consistent.
+/**
+ * @file
  *
- *  COPYRIGHT (c) 1989-2009.
+ * This test exercises the time of day services via the Classic
+ * and POSIX APIs to make sure they are consistent. It additionally
+ * exericses the adjtime() method.
+ * 
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2014.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -129 +135 @@
 
   puts( "adjtime - delta out of range - EINVAL" );
+  delta.tv_sec = 0;
   delta.tv_usec = 1000000000; /* 100 seconds worth */
   sc = adjtime( &delta, &olddelta );
   rtems_test_assert( sc == -1 );
   rtems_test_assert( errno == EINVAL );
+
+  puts( "adjtime - delta range of 0 - OK" );
+  delta.tv_sec = 0;
+  delta.tv_usec = 0;
+  sc = adjtime( &delta, &olddelta );
+  rtems_test_assert( sc == 0 );
 
   puts( "adjtime - delta too small - do nothing" );