Skip to content

fix: make rt_tick_t 64-bit on ARCH_CPU_64BIT and improve clock time precision #10749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lygstate wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: make rt_tick_t 64-bit on ARCH_CPU_64BIT and improve clock time precision #10749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions bsp/rockchip/dm/hwtimer/clock_timer-rockchip_timer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,16 +359,11 @@ static const struct rk_timer_data rk3399_timer_data =

#ifdef RT_USING_CLOCK_TIME

uint64_t rt_clock_hrtimer_getfrq(void)
rt_uint64_t rt_clock_hrtimer_getfrq(void)
{
return OSC_HZ;
}

uint64_t rt_clock_hrtimer_getres(void)
{
return ((1000UL * 1000 * 1000) * RT_CLOCK_TIME_RESMUL) / OSC_HZ;
}

/**
* @brief set the timeout function for hrtimer framework
*
Expand All @@ -377,7 +372,7 @@ uint64_t rt_clock_hrtimer_getres(void)
* @param cnt the count of timer dealy
* @return rt_err_t 0 forever
*/
rt_err_t rt_clock_hrtimer_settimeout(unsigned long cnt)
rt_err_t rt_clock_hrtimer_settimeout(rt_uint64_t cnt)
{
struct hrt_timer *timer = &_timer0;
struct rk_timer *time = timer->timer;
Expand Down
1 change: 0 additions & 1 deletion components/drivers/clock_time/arch/aarch64/cputimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ void rt_clock_time_source_init(void)
rt_uint8_t caps = RT_CLOCK_TIME_CAP_SOURCE;

_aarch64_clock_dev.ops = &_aarch64_clock_ops;
_aarch64_clock_dev.res_scale = RT_CLOCK_TIME_RESMUL;
_aarch64_clock_dev.caps = caps;
rt_clock_time_device_register(&_aarch64_clock_dev, "clock_time_gtimer", caps);
rt_clock_time_set_default_source(&_aarch64_clock_dev);
Expand Down
1 change: 0 additions & 1 deletion components/drivers/clock_time/arch/risc-v/virt64/cputimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ void rt_clock_time_source_init(void)
rt_uint8_t caps = RT_CLOCK_TIME_CAP_SOURCE;

_riscv_clock_dev.ops = &_riscv_clock_ops;
_riscv_clock_dev.res_scale = RT_CLOCK_TIME_RESMUL;
_riscv_clock_dev.caps = caps;
rt_clock_time_device_register(&_riscv_clock_dev, "clock_time_rdtime", caps);
rt_clock_time_set_default_source(&_riscv_clock_dev);
Expand Down
37 changes: 15 additions & 22 deletions components/drivers/clock_time/clock_boottime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,70 +9,63 @@
*/

#include <drivers/clock_time.h>
#include <sys/time.h>

rt_err_t rt_clock_boottime_get_us(struct timeval *tv)
{
rt_uint64_t cnt;
rt_uint64_t res;
rt_uint64_t ns;
rt_uint64_t freq;

RT_ASSERT(tv != RT_NULL);

cnt = rt_clock_time_get_counter();
res = rt_clock_time_get_res_scaled();
if (res == 0)
freq = rt_clock_time_get_freq();
if (freq == 0)
{
return -RT_ERROR;
}

ns = (cnt * res) / RT_CLOCK_TIME_RESMUL;

tv->tv_sec = ns / (1000ULL * 1000 * 1000);
tv->tv_usec = (ns % (1000ULL * 1000 * 1000)) / 1000;
tv->tv_sec = (time_t)(cnt / freq);
tv->tv_usec = rt_muldiv_u64(cnt % freq, MICROSECOND_PER_SECOND, freq, NULL);

return RT_EOK;
}

rt_err_t rt_clock_boottime_get_s(time_t *t)
{
rt_uint64_t cnt;
rt_uint64_t res;
rt_uint64_t ns;
rt_uint64_t freq;

RT_ASSERT(t != RT_NULL);

cnt = rt_clock_time_get_counter();
res = rt_clock_time_get_res_scaled();
if (res == 0)
freq = rt_clock_time_get_freq();
if (freq == 0)
{
return -RT_ERROR;
}

ns = (cnt * res) / RT_CLOCK_TIME_RESMUL;
*t = ns / (1000ULL * 1000 * 1000);
*t = (time_t)(cnt / freq);

return RT_EOK;
}

rt_err_t rt_clock_boottime_get_ns(struct timespec *ts)
{
rt_uint64_t cnt;
rt_uint64_t res;
rt_uint64_t ns;
rt_uint64_t freq;

RT_ASSERT(ts != RT_NULL);

cnt = rt_clock_time_get_counter();
res = rt_clock_time_get_res_scaled();
if (res == 0)
freq = rt_clock_time_get_freq();
if (freq == 0)
{
return -RT_ERROR;
}

ns = (cnt * res) / RT_CLOCK_TIME_RESMUL;

ts->tv_sec = ns / (1000ULL * 1000 * 1000);
ts->tv_nsec = ns % (1000ULL * 1000 * 1000);
ts->tv_sec = (time_t)(cnt / freq);
ts->tv_nsec = rt_muldiv_u64(cnt % freq, NANOSECOND_PER_SECOND, freq, NULL);

return RT_EOK;
}
108 changes: 40 additions & 68 deletions components/drivers/clock_time/clock_hrtimer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,14 @@
#include <rtdevice.h>
#include <rthw.h>
#include <rtthread.h>
#include <sys/time.h>

#include <drivers/clock_time.h>

#define DBG_SECTION_NAME "drv.clock_time"
#define DBG_LEVEL DBG_INFO
#include <rtdbg.h>

#define CLOCK_TIME_NSEC_PER_SEC (1000000000ULL)

#ifdef ARCH_CPU_64BIT
#define _HRTIMER_MAX_CNT UINT64_MAX
#else
#define _HRTIMER_MAX_CNT UINT32_MAX
#endif

static rt_list_t _timer_list = RT_LIST_OBJECT_INIT(_timer_list);
static RT_DEFINE_SPINLOCK(_spinlock);

Expand All @@ -34,57 +27,51 @@ rt_inline rt_clock_hrtimer_t _first_hrtimer(void)
return rt_list_isempty(&_timer_list) ? RT_NULL : rt_list_first_entry(&_timer_list, struct rt_clock_hrtimer, node);
}

rt_inline unsigned long _clock_time_get_cnt(void)
rt_inline rt_tick_t _clock_time_get_cnt(void)
{
return rt_clock_time_get_counter();
return (rt_tick_t)rt_clock_time_get_counter();
}

rt_inline rt_bool_t _cnt_before(unsigned long a, unsigned long b)
rt_inline rt_bool_t _cnt_before(rt_tick_t a, rt_tick_t b)
{
return ((rt_base_t)(a - b)) < 0;
}

rt_inline rt_bool_t _cnt_after(unsigned long a, unsigned long b)
rt_inline rt_bool_t _cnt_after(rt_tick_t a, rt_tick_t b)
{
return _cnt_before(b, a);
}

rt_weak rt_uint64_t rt_clock_hrtimer_getres(void)
{
return rt_clock_time_get_event_res_scaled();
}

rt_weak unsigned long rt_clock_hrtimer_getfrq(void)
rt_weak rt_uint64_t rt_clock_hrtimer_getfrq(void)
{
return (unsigned long)rt_clock_time_get_event_freq();
return rt_clock_time_get_event_freq();
}

static rt_tick_t _hrtimer_cnt_to_tick(unsigned long cnt)
static rt_tick_t _hrtimer_cnt_to_tick(rt_uint64_t cnt)
{
rt_uint64_t res = rt_clock_hrtimer_getres();
rt_uint64_t ns;
rt_uint64_t freq = rt_clock_hrtimer_getfrq();
rt_uint64_t rem = 0;
rt_uint64_t tick;

if (res == 0)
if (freq == 0)
{
return 0;
}

ns = ((rt_uint64_t)cnt * res) / RT_CLOCK_TIME_RESMUL;
if (ns == 0)
tick = rt_muldiv_u64(cnt, RT_TICK_PER_SECOND, freq, &rem);
if (rem != 0)
{
return 1;
tick += 1; /* round up so a non-zero cnt never collapses to a 0-tick timeout */
}

ns = (ns * RT_TICK_PER_SECOND + CLOCK_TIME_NSEC_PER_SEC - 1) / CLOCK_TIME_NSEC_PER_SEC;
if (ns == 0)
if (tick == 0)
{
return 1;
tick = 1; /* at least one tick */
}

return (rt_tick_t)ns;
return (rt_tick_t)tick;
}

rt_weak rt_err_t rt_clock_hrtimer_settimeout(unsigned long cnt)
rt_weak rt_err_t rt_clock_hrtimer_settimeout(rt_uint64_t cnt)
{
static rt_timer_t timer = RT_NULL;
static struct rt_timer _sh_rtimer;
Expand Down Expand Up @@ -124,29 +111,18 @@ rt_weak rt_err_t rt_clock_hrtimer_settimeout(unsigned long cnt)
return RT_EOK;
}

static unsigned long _cnt_convert(unsigned long cnt)
static rt_uint64_t _cnt_convert(rt_tick_t cnt)
{
unsigned long count;
rt_uint64_t src_res;
rt_uint64_t event_res;
rt_uint64_t result;
rt_uint64_t rtn = 0;
rt_tick_t count = cnt - _clock_time_get_cnt();

count = cnt - _clock_time_get_cnt();
if (count > (_HRTIMER_MAX_CNT / 2))
if (count > (RT_TICK_MAX / 2))
{
return 0;
}

src_res = rt_clock_time_get_res_scaled();
event_res = rt_clock_hrtimer_getres();
if (src_res == 0 || event_res == 0)
{
return 0;
}

result = ((rt_uint64_t)count * src_res) / event_res;

return result == 0 ? 1 : (unsigned long)result;
rtn = rt_muldiv_u64(count, rt_clock_hrtimer_getfrq(), rt_clock_time_get_freq(), NULL);
return rtn == 0 ? 1 : rtn;
}

static void _sleep_timeout(void *parameter)
Expand Down Expand Up @@ -177,7 +153,7 @@ static void _hrtimer_process_locked(void)

while ((timer = _first_hrtimer()) != RT_NULL)
{
unsigned long now = _clock_time_get_cnt();
rt_tick_t now = _clock_time_get_cnt();

if (_cnt_before(now, timer->timeout_cnt))
{
Expand Down Expand Up @@ -206,7 +182,7 @@ static void _hrtimer_process_locked(void)
static void _set_next_timeout_locked(void)
{
rt_clock_hrtimer_t timer;
rt_ubase_t next_timeout_cnt;
rt_uint64_t next_timeout_cnt;
rt_bool_t find_next;

do
Expand Down Expand Up @@ -258,12 +234,12 @@ void rt_clock_hrtimer_init(rt_clock_hrtimer_t timer,
rt_completion_init(&timer->completion);
}

rt_err_t rt_clock_hrtimer_start(rt_clock_hrtimer_t timer, unsigned long delay_cnt)
rt_err_t rt_clock_hrtimer_start(rt_clock_hrtimer_t timer, rt_tick_t delay_cnt)
{
rt_base_t level;

RT_ASSERT(timer != RT_NULL);
RT_ASSERT(delay_cnt < (_HRTIMER_MAX_CNT / 2));
RT_ASSERT(delay_cnt < (RT_TICK_MAX / 2));

timer->delay_cnt = delay_cnt;
timer->timeout_cnt = timer->delay_cnt + _clock_time_get_cnt();
Expand Down Expand Up @@ -317,13 +293,13 @@ rt_err_t rt_clock_hrtimer_control(rt_clock_hrtimer_t timer, int cmd, void *arg)
switch (cmd)
{
case RT_TIMER_CTRL_GET_TIME:
*(unsigned long *)arg = timer->delay_cnt;
*(rt_tick_t *)arg = timer->delay_cnt;
break;

case RT_TIMER_CTRL_SET_TIME:
RT_ASSERT((*(unsigned long *)arg) < (_HRTIMER_MAX_CNT / 2));
timer->delay_cnt = *(unsigned long *)arg;
timer->timeout_cnt = *(unsigned long *)arg + _clock_time_get_cnt();
RT_ASSERT((*(rt_tick_t *)arg) < (RT_TICK_MAX / 2));
timer->delay_cnt = *(rt_tick_t *)arg;
timer->timeout_cnt = *(rt_tick_t *)arg + _clock_time_get_cnt();
break;

case RT_TIMER_CTRL_SET_ONESHOT:
Expand All @@ -346,7 +322,7 @@ rt_err_t rt_clock_hrtimer_control(rt_clock_hrtimer_t timer, int cmd, void *arg)
break;

case RT_TIMER_CTRL_GET_REMAIN_TIME:
*(unsigned long *)arg = timer->timeout_cnt;
*(rt_tick_t *)arg = timer->timeout_cnt;
break;
case RT_TIMER_CTRL_GET_FUNC:
if (arg != RT_NULL)
Expand Down Expand Up @@ -408,7 +384,7 @@ void rt_clock_hrtimer_delay_detach(struct rt_clock_hrtimer *timer)
rt_clock_hrtimer_detach(timer);
}

rt_err_t rt_clock_hrtimer_sleep(struct rt_clock_hrtimer *timer, unsigned long cnt)
rt_err_t rt_clock_hrtimer_sleep(struct rt_clock_hrtimer *timer, rt_tick_t cnt)
{
rt_err_t err;

Expand All @@ -430,23 +406,19 @@ rt_err_t rt_clock_hrtimer_sleep(struct rt_clock_hrtimer *timer, unsigned long cn
return err;
}

rt_err_t rt_clock_hrtimer_ndelay(struct rt_clock_hrtimer *timer, unsigned long ns)
rt_err_t rt_clock_hrtimer_ndelay(struct rt_clock_hrtimer *timer, rt_uint64_t ns)
{
rt_uint64_t res = rt_clock_time_get_res_scaled();
if (res == 0)
{
return -RT_ERROR;
}
rt_tick_t cputimer_tick = (rt_tick_t)rt_muldiv_u64(ns, rt_clock_time_get_freq(), NANOSECOND_PER_SECOND, NULL);

return rt_clock_hrtimer_sleep(timer, (ns * RT_CLOCK_TIME_RESMUL) / res);
return rt_clock_hrtimer_sleep(timer, cputimer_tick);
}

rt_err_t rt_clock_hrtimer_udelay(struct rt_clock_hrtimer *timer, unsigned long us)
rt_err_t rt_clock_hrtimer_udelay(struct rt_clock_hrtimer *timer, rt_uint64_t us)
{
return rt_clock_hrtimer_ndelay(timer, us * 1000);
}

rt_err_t rt_clock_hrtimer_mdelay(struct rt_clock_hrtimer *timer, unsigned long ms)
rt_err_t rt_clock_hrtimer_mdelay(struct rt_clock_hrtimer *timer, rt_uint64_t ms)
{
return rt_clock_hrtimer_ndelay(timer, ms * 1000000);
}
Expand Down
Loading
Loading