From 246773faa769fec05c82b0d486f52ce2714b2b46 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 11 Jul 2016 06:54:02 -0600 Subject: [PATCH] Rename CONFIG_SCHED_TIMEKEEPING to CONFIG_CLOCK_TIMEKEEPING. That is a better compartmentalized name. --- arch/arm/src/stm32/stm32_freerun.c | 16 ++++++++-------- arch/arm/src/stm32/stm32_freerun.h | 10 +++++----- arch/arm/src/stm32/stm32_tickless.c | 8 ++++---- include/nuttx/arch.h | 4 ++-- include/sys/syscall.h | 2 +- include/sys/time.h | 2 +- sched/Kconfig | 4 ++-- sched/clock/Make.defs | 2 +- sched/clock/clock.h | 2 +- sched/clock/clock_gettime.c | 10 +++++----- sched/clock/clock_initialize.c | 4 ++-- sched/clock/clock_settime.c | 4 ++-- sched/clock/clock_systimer.c | 4 ++-- sched/clock/clock_timekeeping.c | 4 ++-- sched/sched/sched_processtimer.c | 2 +- sched/sched/sched_timerexpiration.c | 4 ++-- syscall/syscall.csv | 2 +- syscall/syscall_lookup.h | 2 +- 18 files changed, 43 insertions(+), 43 deletions(-) diff --git a/arch/arm/src/stm32/stm32_freerun.c b/arch/arm/src/stm32/stm32_freerun.c index 8a69ce55c4..38133c7c36 100644 --- a/arch/arm/src/stm32/stm32_freerun.c +++ b/arch/arm/src/stm32/stm32_freerun.c @@ -80,7 +80,7 @@ static struct stm32_freerun_s *g_freerun; * ****************************************************************************/ -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING static int stm32_freerun_handler(int irq, void *context) { struct stm32_freerun_s *freerun = g_freerun; @@ -91,7 +91,7 @@ static int stm32_freerun_handler(int irq, void *context) STM32_TIM_ACKINT(freerun->tch, 0); return OK; } -#endif /* CONFIG_SCHED_TIMEKEEPING */ +#endif /* CONFIG_CLOCK_TIMEKEEPING */ /**************************************************************************** * Public Functions @@ -145,11 +145,11 @@ int stm32_freerun_initialize(struct stm32_freerun_s *freerun, int chan, freerun->chan = chan; freerun->running = false; -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING freerun->counter_mask = 0xffffffffull; #endif -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING freerun->overflow = 0; g_freerun = freerun; @@ -166,7 +166,7 @@ int stm32_freerun_initialize(struct stm32_freerun_s *freerun, int chan, STM32_TIM_SETMODE(freerun->tch, STM32_TIM_MODE_UP); -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING STM32_TIM_ACKINT(freerun->tch, 0); STM32_TIM_ENABLEINT(freerun->tch, 0); #endif @@ -193,7 +193,7 @@ int stm32_freerun_initialize(struct stm32_freerun_s *freerun, int chan, * ****************************************************************************/ -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING int stm32_freerun_counter(struct stm32_freerun_s *freerun, struct timespec *ts) @@ -270,7 +270,7 @@ int stm32_freerun_counter(struct stm32_freerun_s *freerun, return OK; } -#else /* CONFIG_SCHED_TIMEKEEPING */ +#else /* CONFIG_CLOCK_TIMEKEEPING */ int stm32_freerun_counter(struct stm32_freerun_s *freerun, uint64_t *counter) { @@ -278,7 +278,7 @@ int stm32_freerun_counter(struct stm32_freerun_s *freerun, uint64_t *counter) return OK; } -#endif /* CONFIG_SCHED_TIMEKEEPING */ +#endif /* CONFIG_CLOCK_TIMEKEEPING */ /**************************************************************************** * Name: stm32_freerun_uninitialize diff --git a/arch/arm/src/stm32/stm32_freerun.h b/arch/arm/src/stm32/stm32_freerun.h index 44bc99b3eb..bc7609666c 100644 --- a/arch/arm/src/stm32/stm32_freerun.h +++ b/arch/arm/src/stm32/stm32_freerun.h @@ -67,11 +67,11 @@ struct stm32_freerun_s FAR struct stm32_tim_dev_s *tch; /* Handle returned by stm32_tim_init() */ uint32_t frequency; -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING uint32_t overflow; /* Timer counter overflow */ #endif -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING uint64_t counter_mask; #endif }; @@ -134,17 +134,17 @@ int stm32_freerun_initialize(struct stm32_freerun_s *freerun, int chan, * ****************************************************************************/ -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING int stm32_freerun_counter(struct stm32_freerun_s *freerun, struct timespec *ts); -#else /* CONFIG_SCHED_TIMEKEEPING */ +#else /* CONFIG_CLOCK_TIMEKEEPING */ int stm32_freerun_counter(struct stm32_freerun_s *freerun, uint64_t *counter); -#endif /* CONFIG_SCHED_TIMEKEEPING */ +#endif /* CONFIG_CLOCK_TIMEKEEPING */ /**************************************************************************** * Name: stm32_freerun_uninitialize diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c index 4affa07a54..82d7a593d2 100644 --- a/arch/arm/src/stm32/stm32_tickless.c +++ b/arch/arm/src/stm32/stm32_tickless.c @@ -272,7 +272,7 @@ void up_timer_initialize(void) * ****************************************************************************/ -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING int up_timer_gettime(FAR struct timespec *ts) { @@ -286,7 +286,7 @@ int up_timer_getcounter(FAR uint64_t *cycles) return stm32_freerun_counter(&g_tickless.freerun, cycles); } -#endif /* CONFIG_SCHED_TIMEKEEPING */ +#endif /* CONFIG_CLOCK_TIMEKEEPING */ /**************************************************************************** * Name: up_timer_getmask @@ -302,13 +302,13 @@ int up_timer_getcounter(FAR uint64_t *cycles) * ****************************************************************************/ -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING void up_timer_getmask(FAR uint64_t *mask) { DEBUGASSERT(mask != NULL); *mask = g_tickless.freerun.counter_mask; } -#endif /* CONFIG_SCHED_TIMEKEEPING */ +#endif /* CONFIG_CLOCK_TIMEKEEPING */ /**************************************************************************** * Name: up_timer_cancel diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h index 159344d318..93a595a44a 100644 --- a/include/nuttx/arch.h +++ b/include/nuttx/arch.h @@ -1496,11 +1496,11 @@ void up_timer_initialize(void); * ****************************************************************************/ -#if defined(CONFIG_SCHED_TICKLESS) && !defined(CONFIG_SCHED_TIMEKEEPING) +#if defined(CONFIG_SCHED_TICKLESS) && !defined(CONFIG_CLOCK_TIMEKEEPING) int up_timer_gettime(FAR struct timespec *ts); #endif -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING int up_timer_getcounter(FAR uint64_t *cycles); void up_timer_getmask(FAR uint64_t *mask); #endif diff --git a/include/sys/syscall.h b/include/sys/syscall.h index b36f45ebaf..bb8313b3e9 100644 --- a/include/sys/syscall.h +++ b/include/sys/syscall.h @@ -215,7 +215,7 @@ #define SYS_clock_getres (__SYS_clock+1) #define SYS_clock_gettime (__SYS_clock+2) #define SYS_clock_settime (__SYS_clock+3) -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING # define SYS_adjtime (__SYS_clock+4) # define __SYS_timers (__SYS_clock+5) #else diff --git a/include/sys/time.h b/include/sys/time.h index 70eb1d65c0..7b1e15e9b5 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -227,7 +227,7 @@ int settimeofday(FAR const struct timeval *tv, FAR struct timezone *tz); * ****************************************************************************/ -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING int adjtime(FAR const struct timeval *delta, FAR struct timeval *olddelta); #endif diff --git a/sched/Kconfig b/sched/Kconfig index 4eae37d9e2..731baa801e 100644 --- a/sched/Kconfig +++ b/sched/Kconfig @@ -171,12 +171,12 @@ config ARCH_HAVE_TIMEKEEPING bool default n -config SCHED_TIMEKEEPING +config CLOCK_TIMEKEEPING bool "Support timekeeping algorithms" default n depends on EXPERIMENTAL && ARCH_HAVE_TIMEKEEPING ---help--- - SCHED_TIMEKEEPING enables experimental time management algorithms. + CLOCK_TIMEKEEPING enables experimental time management algorithms. config JULIAN_TIME bool "Enables Julian time conversions" diff --git a/sched/clock/Make.defs b/sched/clock/Make.defs index 9ec58f4256..078f445e3e 100644 --- a/sched/clock/Make.defs +++ b/sched/clock/Make.defs @@ -38,7 +38,7 @@ 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 +ifeq ($(CONFIG_CLOCK_TIMEKEEPING),y CSRCS += clock_timekeeping.c endif diff --git a/sched/clock/clock.h b/sched/clock/clock.h index eb54cc7a8b..a3286dfc31 100644 --- a/sched/clock/clock.h +++ b/sched/clock/clock.h @@ -79,7 +79,7 @@ extern volatile uint32_t g_system_timer; # endif #endif -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING extern struct timespec g_basetime; #endif diff --git a/sched/clock/clock_gettime.c b/sched/clock/clock_gettime.c index 5b63a0bcee..74ffea5be8 100644 --- a/sched/clock/clock_gettime.c +++ b/sched/clock/clock_gettime.c @@ -49,7 +49,7 @@ #include #include "clock/clock.h" -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING # include "clock/clock_timekeeping.h" #endif @@ -93,7 +93,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp) * reset. */ -#if defined(CONFIG_SCHED_TIMEKEEPING) +#if defined(CONFIG_CLOCK_TIMEKEEPING) ret = clock_timekeeping_get_monotonic_time(tp); #elif defined(CONFIG_SCHED_TICKLESS) ret = up_timer_gettime(tp); @@ -118,7 +118,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp) * last set. */ -#if defined(CONFIG_SCHED_TIMEKEEPING) +#if defined(CONFIG_CLOCK_TIMEKEEPING) ret = clock_timekeeping_get_wall_time(tp); #elif defined(CONFIG_SCHED_TICKLESS) ret = up_timer_gettime(&ts); @@ -126,7 +126,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp) ret = clock_systimespec(&ts); #endif -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING if (ret == OK) { /* Add the base time to this. The base time is the time-of-day @@ -151,7 +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 */ +#endif /* CONFIG_CLOCK_TIMEKEEPING */ } else { diff --git a/sched/clock/clock_initialize.c b/sched/clock/clock_initialize.c index d9008853d0..9e5d9f93f4 100644 --- a/sched/clock/clock_initialize.c +++ b/sched/clock/clock_initialize.c @@ -54,7 +54,7 @@ #include #include "clock/clock.h" -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING # include "clock/clock_timekeeping.h" #endif @@ -175,7 +175,7 @@ static void clock_inittime(void) { /* (Re-)initialize the time value to match the RTC */ -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING #ifndef CONFIG_RTC_HIRES clock_basetime(&g_basetime); #endif diff --git a/sched/clock/clock_settime.c b/sched/clock/clock_settime.c index 1ff05e73f1..ec0c1d85be 100644 --- a/sched/clock/clock_settime.c +++ b/sched/clock/clock_settime.c @@ -48,7 +48,7 @@ #include #include "clock/clock.h" -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING # include "clock/clock_timekeeping.h" #endif @@ -79,7 +79,7 @@ int clock_settime(clockid_t clock_id, FAR const struct timespec *tp) if (clock_id == CLOCK_REALTIME) { -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING /* Interrupts are disabled here so that the in-memory time * representation and the RTC setting will be as close as * possible. diff --git a/sched/clock/clock_systimer.c b/sched/clock/clock_systimer.c index 1c8e7d3ce5..6c9645fbf8 100644 --- a/sched/clock/clock_systimer.c +++ b/sched/clock/clock_systimer.c @@ -83,7 +83,7 @@ systime_t clock_systimer(void) /* Get the time from the platform specific hardware */ -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING (void)up_timer_gettime(&ts); #else (void)clock_timekeeping_get_monotonic_time(&ts); @@ -100,7 +100,7 @@ systime_t clock_systimer(void) /* Get the time from the platform specific hardware */ -#ifndef CONFIG_SCHED_TIMEKEEPING +#ifndef CONFIG_CLOCK_TIMEKEEPING (void)up_timer_gettime(&ts); #else (void)clock_timekeeping_get_monotonic_time(&ts); diff --git a/sched/clock/clock_timekeeping.c b/sched/clock/clock_timekeeping.c index ceaa234aec..c8fb361c6f 100644 --- a/sched/clock/clock_timekeeping.c +++ b/sched/clock/clock_timekeeping.c @@ -39,7 +39,7 @@ #include -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING #include #include @@ -326,4 +326,4 @@ void clock_inittimekeeping(void) memset(&g_clock_monotonic_time, 0, sizeof(g_clock_monotonic_time)); } -#endif /* CONFIG_SCHED_TIMEKEEPING */ +#endif /* CONFIG_CLOCK_TIMEKEEPING */ diff --git a/sched/sched/sched_processtimer.c b/sched/sched/sched_processtimer.c index efdf3aee32..9b64abed1b 100644 --- a/sched/sched/sched_processtimer.c +++ b/sched/sched/sched_processtimer.c @@ -144,7 +144,7 @@ static inline void sched_process_scheduler(void) void sched_process_timer(void) { -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING /* Process wall time */ clock_update_wall_time(); diff --git a/sched/sched/sched_timerexpiration.c b/sched/sched/sched_timerexpiration.c index 064f3ab03b..309b1a705d 100644 --- a/sched/sched/sched_timerexpiration.c +++ b/sched/sched/sched_timerexpiration.c @@ -53,7 +53,7 @@ #include "wdog/wdog.h" #include "clock/clock.h" -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING # include "clock/clock_timekeeping.h" #endif @@ -266,7 +266,7 @@ static unsigned int sched_timer_process(unsigned int ticks, bool noswitches) unsigned int rettime = 0; unsigned int tmp; -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING /* Process wall time */ clock_update_wall_time(); diff --git a/syscall/syscall.csv b/syscall/syscall.csv index 624fe94b88..0463573dd2 100644 --- a/syscall/syscall.csv +++ b/syscall/syscall.csv @@ -1,5 +1,5 @@ "_exit","unistd.h","","void","int" -"adjtime","sys/time.h","defined(CONFIG_SCHED_TIMEKEEPING)","int","FAR const struct timeval *","FAR struct timeval *" +"adjtime","sys/time.h","defined(CONFIG_CLOCK_TIMEKEEPING)","int","FAR const struct timeval *","FAR struct timeval *" "aio_cancel","aio.h","defined(CONFIG_FS_AIO)","int","int","FAR struct aiocb *" "aio_fsync","aio.h","defined(CONFIG_FS_AIO)","int","int","FAR struct aiocb *" "aio_read","aio.h","defined(CONFIG_FS_AIO)","int","FAR struct aiocb *" diff --git a/syscall/syscall_lookup.h b/syscall/syscall_lookup.h index 91ac53cc32..a3e66f9dc5 100644 --- a/syscall/syscall_lookup.h +++ b/syscall/syscall_lookup.h @@ -152,7 +152,7 @@ SYSCALL_LOOKUP(up_assert, 2, STUB_up_assert) SYSCALL_LOOKUP(clock_getres, 2, STUB_clock_getres) SYSCALL_LOOKUP(clock_gettime, 2, STUB_clock_gettime) SYSCALL_LOOKUP(clock_settime, 2, STUB_clock_settime) -#ifdef CONFIG_SCHED_TIMEKEEPING +#ifdef CONFIG_CLOCK_TIMEKEEPING SYSCALL_LOOKUP(adjtime, 2, STUB_adjtime) #endif