Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

timekeeping: initial implementation

Browse Source
This commit is contained in:
Max Neklyudov
2016-07-10 16:14:25 -06:00
committed by Gregory Nutt
parent 90917d9741
commit 8db29071da
17 changed files with 533 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/clock/Make.defs
+4
View File
@@ -38,6 +38,10 @@ CSRCS += clock_time2ticks.c clock_abstime2ticks.c clock_ticks2time.c
CSRCS += clock_systimer.c clock_systimespec.c clock_timespec_add.c
CSRCS += clock_timespec_subtract.c
ifeq ($(CONFIG_SCHED_TIMEKEEPING),y
CSRCS += clock_timekeeping.c
endif
# Include clock build support
DEPPATH += --dep-path clock
sched/clock/clock.h
+2
View File
@@ -79,7 +79,9 @@ extern volatile uint32_t g_system_timer;
# endif
#endif
#ifndef CONFIG_SCHED_TIMEKEEPING
extern struct timespec g_basetime;
#endif
/********************************************************************************
* Public Function Prototypes
sched/clock/clock_gettime.c
+15 -1
View File
@@ -49,6 +49,9 @@
#include <nuttx/arch.h>
#include "clock/clock.h"
#ifdef CONFIG_SCHED_TIMEKEEPING
# include "clock/clock_timekeeping.h"
#endif
/****************************************************************************
* Public Functions
@@ -90,7 +93,9 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
* reset.
*/
#ifdef CONFIG_SCHED_TICKLESS
#if defined(CONFIG_SCHED_TIMEKEEPING)
ret = clock_timekeeping_get_monotonic_time(tp);
#elif defined(CONFIG_SCHED_TICKLESS)
ret = up_timer_gettime(tp);
#else
ret = clock_systimespec(tp);
@@ -113,7 +118,15 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
* last set.
*/
#if defined(CONFIG_SCHED_TIMEKEEPING)
ret = clock_timekeeping_get_wall_time(tp);
#elif defined(CONFIG_SCHED_TICKLESS)
ret = up_timer_gettime(&ts);
#else
ret = clock_systimespec(&ts);
#endif
#ifndef CONFIG_SCHED_TIMEKEEPING
if (ret == OK)
{
/* Add the base time to this. The base time is the time-of-day
@@ -138,6 +151,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
tp->tv_sec = ts.tv_sec;
tp->tv_nsec = ts.tv_nsec;
}
#endif /* CONFIG_SCHED_TIMEKEEPING */
}
else
{
sched/clock/clock_initialize.c
+10 -1
View File
@@ -54,6 +54,9 @@
#include <nuttx/time.h>
#include "clock/clock.h"
#ifdef CONFIG_SCHED_TIMEKEEPING
# include "clock/clock_timekeeping.h"
#endif
/****************************************************************************
* Pre-processor Definitions
@@ -172,10 +175,16 @@ static void clock_inittime(void)
{
/* (Re-)initialize the time value to match the RTC */
(void)clock_basetime(&g_basetime);
#ifndef CONFIG_SCHED_TIMEKEEPING
#ifndef CONFIG_RTC_HIRES
clock_basetime(&g_basetime);
#endif
#ifndef CONFIG_SCHED_TICKLESS
g_system_timer = 0;
#endif
#else
clock_inittimekeeping();
#endif
}
/****************************************************************************
sched/clock/clock_settime.c
+7
View File
@@ -48,6 +48,9 @@
#include <nuttx/irq.h>
#include "clock/clock.h"
#ifdef CONFIG_SCHED_TIMEKEEPING
# include "clock/clock_timekeeping.h"
#endif
/****************************************************************************
* Public Functions
@@ -76,6 +79,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
if (clock_id == CLOCK_REALTIME)
{
#ifndef CONFIG_SCHED_TIMEKEEPING
/* Interrupts are disabled here so that the in-memory time
* representation and the RTC setting will be as close as
* possible.
@@ -123,6 +127,9 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp)
sinfo("basetime=(%ld,%lu) bias=(%ld,%lu)\n",
(long)g_basetime.tv_sec, (unsigned long)g_basetime.tv_nsec,
(long)bias.tv_sec, (unsigned long)bias.tv_nsec);
#else
ret = clock_timekeeping_set_wall_time(tp);
#endif
}
else
{
sched/clock/clock_systimer.c
+8
View File
@@ -83,7 +83,11 @@ systime_t clock_systimer(void)
/* Get the time from the platform specific hardware */
#ifndef CONFIG_SCHED_TIMEKEEPING
(void)up_timer_gettime(&ts);
#else
(void)clock_timekeeping_get_monotonic_time(&ts);
#endif
/* Convert to a 64-bit value in microseconds, then in clock tick units */
@@ -96,7 +100,11 @@ systime_t clock_systimer(void)
/* Get the time from the platform specific hardware */
#ifndef CONFIG_SCHED_TIMEKEEPING
(void)up_timer_gettime(&ts);
#else
(void)clock_timekeeping_get_monotonic_time(&ts);
#endif
/* Convert to a 64- then a 32-bit value */
sched/clock/clock_timekeeping.c
+297
View File
@@ -0,0 +1,297 @@
/************************************************************************
* sched/clock/clock_timekeeping.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Max Neklyudov <macscomp@gmail.com>
*
* 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.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* 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.
*
************************************************************************/
/************************************************************************
* Included Files
************************************************************************/
#include <nuttx/config.h>
#ifdef CONFIG_SCHED_TIMEKEEPING
#include <sys/time.h>
#include <stdint.h>
#include <time.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include "clock/clock.h"
/************************************************************************
* Pre-processor Definitions
************************************************************************/
#define NTP_MAX_ADJUST 500
/**********************************************************************
* Private Data
**********************************************************************/
static struct timespec g_clock_wall_time;
static struct timespec g_clock_monotonic_time;
static uint64_t g_clock_last_counter;
static uint64_t g_clock_mask;
static long g_clock_adjust;
/************************************************************************
* Private Functions
************************************************************************/
/************************************************************************
* Name: clock_get_current_time
************************************************************************/
static int clock_get_current_time(FAR struct timespec *ts,
FAR struct timespec *base)
{
irqstate_t flags;
uint64_t counter;
uint64_t offset;
uint64_t nsec;
time_t sec;
int ret;
flags = enter_critical_section();
ret = up_timer_getcounter(&counter);
if (ret < 0)
{
goto errout_in_critical_section;
}
offset = (counter - g_clock_last_counter) & g_clock_mask;
nsec = offset * NSEC_PER_TICK;
sec = nsec / NSEC_PER_SEC;
nsec -= sec * NSEC_PER_SEC;
nsec += base->tv_nsec;
if (nsec > NSEC_PER_SEC)
{
nsec -= NSEC_PER_SEC;
sec += 1;
}
ts->tv_nsec = nsec;
ts->tv_sec = base->tv_sec + sec;
errout_in_critical_section:
leave_critical_section(flags);
return ret;
}
/************************************************************************
* Public Functions
************************************************************************/
/************************************************************************
* Name: clock_timekeeping_get_monotonic_time
************************************************************************/
int clock_timekeeping_get_monotonic_time(FAR struct timespec *ts)
{
return clock_get_current_time(ts, &g_clock_monotonic_time);
}
/************************************************************************
* Name: clock_timekeeping_get_wall_time
************************************************************************/
int clock_timekeeping_get_wall_time(FAR struct timespec *ts)
{
return clock_get_current_time(ts, &g_clock_wall_time);
}
/************************************************************************
* Name: clock_timekeeping_set_wall_time
************************************************************************/
int clock_timekeeping_set_wall_time(FAR struct timespec *ts)
{
irqstate_t flags;
uint64_t counter;
int ret;
flags = enter_critical_section();
ret = up_timer_getcounter(&counter);
if (ret < 0)
{
goto errout_in_critical_section;
}
g_clock_wall_time = *ts;
g_clock_adjust = 0;
g_clock_last_counter = counter;
errout_in_critical_section:
leave_critical_section(flags);
return ret;
}
/************************************************************************
* Name: adjtime
************************************************************************/
int adjtime(const struct timeval *delta, struct timeval *olddelta)
{
irqstate_t flags;
long adjust_usec;
if (!delta)
{
set_errno(EINVAL);
return -1;
}
flags = enter_critical_section();
adjust_usec = delta->tv_sec * USEC_PER_SEC + delta->tv_usec;
if (olddelta)
{
olddelta->tv_usec = g_clock_adjust;
}
g_clock_adjust = adjust_usec;
leave_critical_section(flags);
return OK;
}
/************************************************************************
* Name: clock_update_wall_time
************************************************************************/
void clock_update_wall_time(void)
{
irqstate_t flags;
uint64_t counter;
uint64_t offset;
int64_t nsec;
time_t sec;
int ret;
flags = enter_critical_section();
ret = up_timer_getcounter(&counter);
if (ret < 0)
{
goto errout_in_critical_section;
}
offset = (counter - g_clock_last_counter) & g_clock_mask;
if (offset == 0)
{
goto errout_in_critical_section;
}
nsec = offset * NSEC_PER_TICK;
sec = nsec / NSEC_PER_SEC;
nsec -= sec * NSEC_PER_SEC;
g_clock_monotonic_time.tv_sec += sec;
g_clock_monotonic_time.tv_nsec += nsec;
if (g_clock_monotonic_time.tv_nsec > NSEC_PER_SEC)
{
g_clock_monotonic_time.tv_nsec -= NSEC_PER_SEC;
g_clock_monotonic_time.tv_sec += 1;
}
nsec += g_clock_wall_time.tv_nsec;
if (nsec > NSEC_PER_SEC)
{
nsec -= NSEC_PER_SEC;
sec += 1;
}
if (g_clock_adjust != 0 && sec > 0)
{
long adjust = NTP_MAX_ADJUST * (long)sec;
if (g_clock_adjust < adjust && g_clock_adjust > -adjust)
{
adjust = g_clock_adjust;
}
nsec += adjust * NSEC_PER_USEC;
while (nsec < 0)
{
nsec += NSEC_PER_SEC;
sec -= 1;
}
while (nsec > NSEC_PER_SEC)
{
nsec -= NSEC_PER_SEC;
sec += 1;
}
}
g_clock_wall_time.tv_sec += sec;
g_clock_wall_time.tv_nsec = (long)nsec;
g_clock_last_counter = counter;
errout_in_critical_section:
leave_critical_section(flags);
}
/************************************************************************
* Name: clock_inittimekeeping
************************************************************************/
void clock_inittimekeeping(void)
{
struct tm rtctime;
up_timer_getmask(&g_clock_mask);
/* Get the broken-errout_in_critical_section time from the date/time RTC. */
(void)up_rtc_getdatetime(&rtctime);
/* And use the broken-errout_in_critical_section time to initialize the system time */
g_clock_wall_time.tv_sec = mktime(&rtctime);
g_clock_wall_time.tv_nsec = 0;
memset(&g_clock_monotonic_time, 0, sizeof(g_clock_monotonic_time));
}
#endif /* CONFIG_SCHED_TIMEKEEPING */
sched/clock/clock_timekeeping.h
+62
View File
@@ -0,0 +1,62 @@
/********************************************************************************
* sched/clock/clock_timekeeping.h
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Author: Max Neklyudov <macscomp@gmail.com>
*
* 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.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* 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.
*
********************************************************************************/
#ifndef __SCHED_CLOCK_CLOCK_TIMEKEEPING_H
#define __SCHED_CLOCK_CLOCK_TIMEKEEPING_H
/********************************************************************************
* Included Files
********************************************************************************/
#include <nuttx/config.h>
#include <nuttx/compiler.h>
#include <stdint.h>
#include <nuttx/clock.h>
/********************************************************************************
* Public Function Prototypes
********************************************************************************/
int clock_timekeeping_get_monotonic_time(FAR struct timespec *ts);
int clock_timekeeping_get_wall_time(FAR struct timespec *ts);
int clock_timekeeping_set_wall_time(FAR struct timespec *ts);
void clock_update_wall_time(void);
void clock_inittimekeeping(void);
#endif /* __SCHED_CLOCK_CLOCK_TIMEKEEPING_H */