diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-11-16 14:14:03 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-11-21 16:29:40 +0100 |
commit | 90733a86b881374d5c76a3af904a4edc0c86f6ca (patch) | |
tree | 6ff20e1e9adf3c948b643a8e7cf2d04dd11147c3 | |
parent | rtems: Add rtems_clock_get_uptime_timeval() (diff) | |
download | rtems-90733a86b881374d5c76a3af904a4edc0c86f6ca.tar.bz2 |
rtems: Add rtems_clock_get_uptime_seconds()
-rw-r--r-- | cpukit/rtems/Makefile.am | 1 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems/rtems/clock.h | 7 | ||||
-rw-r--r-- | cpukit/rtems/src/clockgetuptimeseconds.c | 34 | ||||
-rw-r--r-- | doc/user/clock.t | 31 | ||||
-rw-r--r-- | testsuites/sptests/sp09/screen02.c | 3 | ||||
-rw-r--r-- | testsuites/sptests/sp09/sp09.scn | 1 |
6 files changed, 77 insertions, 0 deletions
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 10a5cfaf5d..6295990a74 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -155,6 +155,7 @@ librtems_a_SOURCES += src/clockgettod.c librtems_a_SOURCES += src/clockgettodtimeval.c librtems_a_SOURCES += src/clockgetuptime.c librtems_a_SOURCES += src/clockgetuptimetimeval.c +librtems_a_SOURCES += src/clockgetuptimeseconds.c librtems_a_SOURCES += src/clockset.c librtems_a_SOURCES += src/clocksetnsecshandler.c librtems_a_SOURCES += src/clocktick.c diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/cpukit/rtems/include/rtems/rtems/clock.h index 9805f58e10..c7b9a4ab93 100644 --- a/cpukit/rtems/include/rtems/rtems/clock.h +++ b/cpukit/rtems/include/rtems/rtems/clock.h @@ -235,6 +235,13 @@ rtems_status_code rtems_clock_get_uptime( void rtems_clock_get_uptime_timeval( struct timeval *uptime ); /** + * @brief Returns the system uptime in seconds. + * + * @return The system uptime in seconds. + */ +time_t rtems_clock_get_uptime_seconds( void ); + +/** * @brief _TOD_Validate * * This support function returns true if @a the_tod contains diff --git a/cpukit/rtems/src/clockgetuptimeseconds.c b/cpukit/rtems/src/clockgetuptimeseconds.c new file mode 100644 index 0000000000..dc98d1d9e9 --- /dev/null +++ b/cpukit/rtems/src/clockgetuptimeseconds.c @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2012 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Obere Lagerstr. 30 + * 82178 Puchheim + * Germany + * <rtems@embedded-brains.de> + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +#if HAVE_CONFIG_H + #include "config.h" +#endif + +#include <rtems/rtems/clock.h> + +time_t rtems_clock_get_uptime_seconds( void ) +{ + Timestamp_Control snapshot_as_timestamp; + struct timespec snapshot_as_timespec; + ISR_Level level; + + _ISR_Disable( level ); + snapshot_as_timestamp = _TOD.uptime; + _ISR_Enable( level ); + + _Timestamp_To_timespec( &snapshot_as_timestamp, &snapshot_as_timespec ); + + return snapshot_as_timespec.tv_sec; +} diff --git a/doc/user/clock.t b/doc/user/clock.t index 15cfc8dcd8..368e2874e8 100644 --- a/doc/user/clock.t +++ b/doc/user/clock.t @@ -23,6 +23,7 @@ the clock manager are: @item @code{@value{DIRPREFIX}clock_get_ticks_since_boot} - Get ticks since boot @item @code{@value{DIRPREFIX}clock_get_uptime} - Get time since boot @item @code{@value{DIRPREFIX}clock_get_uptime_timeval} - Get time since boot in timeval format +@item @code{@value{DIRPREFIX}clock_get_uptime_seconds} - Get seconds since boot @item @code{@value{DIRPREFIX}clock_set_nanoseconds_extension} - Install the nanoseconds since last tick handler @item @code{@value{DIRPREFIX}clock_tick} - Announce a clock tick @end itemize @@ -705,6 +706,36 @@ This directive may be called from an ISR. @c @c @page +@subsection CLOCK_GET_UPTIME_SECONDS - Get the seconds since boot + +@cindex clock get uptime +@cindex uptime + +@subheading CALLING SEQUENCE: + +@ifset is-C +@findex rtems_clock_get_uptime_seconds +@example +time_t rtems_clock_get_uptime_seconds(void); +@end example +@end ifset + +@subheading DIRECTIVE STATUS CODES: + +The system uptime in seconds. + +@subheading DESCRIPTION: + +This directive returns the seconds since the system was booted. + +@subheading NOTES: + +This directive may be called from an ISR. + +@c +@c +@c +@page @subsection CLOCK_SET_NANOSECONDS_EXTENSION - Install the nanoseconds since last tick handler @cindex clock set nanoseconds extension diff --git a/testsuites/sptests/sp09/screen02.c b/testsuites/sptests/sp09/screen02.c index d4fe370b36..fb735dac2c 100644 --- a/testsuites/sptests/sp09/screen02.c +++ b/testsuites/sptests/sp09/screen02.c @@ -86,6 +86,9 @@ void Screen2() puts( "TA1 - rtems_clock_get_uptime_timeval" ); rtems_clock_get_uptime_timeval( &tv ); + puts( "TA1 - rtems_clock_get_uptime_seconds" ); + rtems_clock_get_uptime_seconds(); + puts( "TA1 - rtems_clock_get_tod_timeval - RTEMS_INVALID_ADDRESS" ); status = rtems_clock_get_tod_timeval( NULL ); fatal_directive_status( diff --git a/testsuites/sptests/sp09/sp09.scn b/testsuites/sptests/sp09/sp09.scn index 938091e171..d1a616d01b 100644 --- a/testsuites/sptests/sp09/sp09.scn +++ b/testsuites/sptests/sp09/sp09.scn @@ -32,6 +32,7 @@ TA1 - rtems_clock_get_seconds_since_epoch - RTEMS_INVALID_ADDRESS TA1 - rtems_clock_get_seconds_since_epoch - RTEMS_NOT_DEFINED TA1 - rtems_clock_get_uptime - RTEMS_INVALID_ADDRESS TA1 - rtems_clock_get_uptime_timeval +TA1 - rtems_clock_get_uptime_seconds TA1 - rtems_clock_get_tod_timeval - RTEMS_INVALID_ADDRESS TA1 - rtems_clock_get_tod_timeval - RTEMS_NOT_DEFINED TA1 - rtems_clock_set_nanoseconds_extension - RTEMS_INVALID_ADDRESS |