diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-09-03 09:46:36 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-09-06 12:22:44 +0200 |
commit | 54b4b1f85af465acb4627ec423599a6c3b4a6fad (patch) | |
tree | f3bad4aa3f81fc8edee24fdb5c1138f39f128297 /cpukit/score | |
parent | score: Remove TOD_TICKS_PER_SECOND_method() (diff) | |
download | rtems-54b4b1f85af465acb4627ec423599a6c3b4a6fad.tar.bz2 |
score: Add _TOD_Is_valid_new_time_of_day()
Move the TOD validation to the callers of _TOD_Set(). This avoids dead code in
case only rtems_clock_set() is used in an application because rtems_clock_set()
always calls _TOD_Set() with a valid time of day.
Diffstat (limited to 'cpukit/score')
-rw-r--r-- | cpukit/score/src/coretodadjust.c | 7 | ||||
-rw-r--r-- | cpukit/score/src/coretodcheck.c | 59 | ||||
-rw-r--r-- | cpukit/score/src/coretodset.c | 22 |
3 files changed, 67 insertions, 21 deletions
diff --git a/cpukit/score/src/coretodadjust.c b/cpukit/score/src/coretodadjust.c index 90c99803e1..b048aeee71 100644 --- a/cpukit/score/src/coretodadjust.c +++ b/cpukit/score/src/coretodadjust.c @@ -42,7 +42,12 @@ Status_Control _TOD_Adjust( _TOD_Acquire( &lock_context ); _TOD_Get( &tod ); _Timespec_Add_to( &tod, delta ); - status = _TOD_Set( &tod, &lock_context ); + status = _TOD_Is_valid_new_time_of_day( &tod ); + + if ( status == STATUS_SUCCESSFUL ) { + status = _TOD_Set( &tod, &lock_context ); + } + _TOD_Unlock(); return status; diff --git a/cpukit/score/src/coretodcheck.c b/cpukit/score/src/coretodcheck.c new file mode 100644 index 0000000000..b42435aa43 --- /dev/null +++ b/cpukit/score/src/coretodcheck.c @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSScoreTOD + * + * @brief This source file contains the implementation of + * _TOD_Is_valid_new_time_of_day(). + */ + +/* + * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/score/todimpl.h> +#include <rtems/score/watchdogimpl.h> + +Status_Control _TOD_Is_valid_new_time_of_day( const struct timespec *tod ) +{ + if ( !_Watchdog_Is_valid_timespec( tod ) ) { + return STATUS_INVALID_NUMBER; + } + + if ( tod->tv_sec < TOD_SECONDS_1970_THROUGH_1988 ) { + return STATUS_INVALID_NUMBER; + } + + if ( _Watchdog_Is_far_future_timespec( tod ) ) { + return STATUS_INVALID_NUMBER; + } + + return STATUS_SUCCESSFUL; +} diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c index 5fc01215e0..b04242a0da 100644 --- a/cpukit/score/src/coretodset.c +++ b/cpukit/score/src/coretodset.c @@ -23,25 +23,6 @@ #include <rtems/score/assert.h> #include <rtems/score/watchdogimpl.h> -static Status_Control _TOD_Check_time_of_day_and_run_hooks( - const struct timespec *tod -) -{ - if ( !_Watchdog_Is_valid_timespec( tod ) ) { - return STATUS_INVALID_NUMBER; - } - - if ( tod->tv_sec < TOD_SECONDS_1970_THROUGH_1988 ) { - return STATUS_INVALID_NUMBER; - } - - if ( _Watchdog_Is_far_future_timespec( tod ) ) { - return STATUS_INVALID_NUMBER; - } - - return _TOD_Hook_Run( TOD_ACTION_SET_CLOCK, tod ); -} - Status_Control _TOD_Set( const struct timespec *tod, ISR_lock_Context *lock_context @@ -54,8 +35,9 @@ Status_Control _TOD_Set( Status_Control status; _Assert( _TOD_Is_owner() ); + _Assert( _TOD_Is_valid_new_time_of_day( tod ) == STATUS_SUCCESSFUL ); - status = _TOD_Check_time_of_day_and_run_hooks( tod ); + status = _TOD_Hook_Run( TOD_ACTION_SET_CLOCK, tod ); if ( status != STATUS_SUCCESSFUL ) { _TOD_Release( lock_context ); return status; |