Skip to content

Commit 2cbe8bd

Browse files
ComerLaterComerLater
authored
解决ktime部分函数计算时unsigned long溢出 (#9008)
* 解决ktime部分函数计算时unsigned long溢出 * 恢复部分不需要ktime中部分rt_uint64_t类型的为unsigned long
1 parent 2fcf151 commit 2cbe8bd

File tree

7 files changed

+78
-78
lines changed

7 files changed

+78
-78
lines changed

‎.clang-format

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ AlignConsecutiveBitFields:
2323
AlignCompound: true
2424
PadOperators: true
2525
AlignConsecutiveDeclarations:
26-
Enabled: false
26+
Enabled: true
2727
AcrossEmptyLines: false
2828
AcrossComments: false
2929
AlignCompound: false

‎components/drivers/ktime/inc/ktime.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
#include "rtthread.h"
2020

21-
#define RT_KTIME_RESMUL (1000000UL)
21+
#define RT_KTIME_RESMUL (1000000ULL)
2222

2323
struct rt_ktime_hrtimer
2424
{
2525
struct rt_object parent; /**< inherit from rt_object */
2626
rt_list_t row;
27-
void *parameter;
27+
void *parameter;
2828
unsigned long init_cnt;
2929
unsigned long timeout_cnt;
3030
rt_err_t error;
@@ -62,7 +62,7 @@ rt_err_t rt_ktime_boottime_get_ns(struct timespec *ts);
6262
*
6363
* @return (resolution * RT_KTIME_RESMUL)
6464
*/
65-
unsigned long rt_ktime_cputimer_getres(void);
65+
rt_uint64_t rt_ktime_cputimer_getres(void);
6666

6767
/**
6868
* @brief Get cputimer frequency
@@ -96,7 +96,7 @@ void rt_ktime_cputimer_init(void);
9696
*
9797
* @return (resolution * RT_KTIME_RESMUL)
9898
*/
99-
unsigned long rt_ktime_hrtimer_getres(void);
99+
rt_uint64_t rt_ktime_hrtimer_getres(void);
100100

101101
/**
102102
* @brief Get hrtimer frequency

‎components/drivers/ktime/src/aarch64/cputimer.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
static volatile unsigned long _init_cnt = 0;
1515

16-
unsigned long rt_ktime_cputimer_getres(void)
16+
rt_uint64_t rt_ktime_cputimer_getres(void)
1717
{
18-
return ((1000UL * 1000 * 1000) * RT_KTIME_RESMUL) / rt_hw_get_gtimer_frq();
18+
return ((1000ULL * 1000 * 1000) * RT_KTIME_RESMUL) / rt_hw_get_gtimer_frq();
1919
}
2020

2121
unsigned long rt_ktime_cputimer_getfrq(void)

‎components/drivers/ktime/src/boottime.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010

1111
#include "ktime.h"
1212

13-
#define __KTIME_MUL ((1000UL * 1000 * 1000) / RT_TICK_PER_SECOND)
13+
#define __KTIME_MUL ((1000ULL * 1000 * 1000) / RT_TICK_PER_SECOND)
1414

1515
rt_weak rt_err_t rt_ktime_boottime_get_us(struct timeval *tv)
1616
{
1717
RT_ASSERT(tv != RT_NULL);
1818

19-
unsigned long ns = (rt_ktime_cputimer_getcnt() * rt_ktime_cputimer_getres()) / RT_KTIME_RESMUL;
19+
rt_uint64_t ns = (rt_ktime_cputimer_getcnt() * rt_ktime_cputimer_getres()) / RT_KTIME_RESMUL;
2020

21-
tv->tv_sec = ns / (1000UL * 1000 * 1000);
22-
tv->tv_usec = (ns % (1000UL * 1000 * 1000)) / 1000;
21+
tv->tv_sec = ns / (1000ULL * 1000 * 1000);
22+
tv->tv_usec = (ns % (1000ULL * 1000 * 1000)) / 1000;
2323

2424
return RT_EOK;
2525
}
@@ -28,9 +28,9 @@ rt_weak rt_err_t rt_ktime_boottime_get_s(time_t *t)
2828
{
2929
RT_ASSERT(t != RT_NULL);
3030

31-
unsigned long ns = (rt_ktime_cputimer_getcnt() * rt_ktime_cputimer_getres()) / RT_KTIME_RESMUL;
31+
rt_uint64_t ns = (rt_ktime_cputimer_getcnt() * rt_ktime_cputimer_getres()) / RT_KTIME_RESMUL;
3232

33-
*t = ns / (1000UL * 1000 * 1000);
33+
*t = ns / (1000ULL * 1000 * 1000);
3434

3535
return RT_EOK;
3636
}
@@ -39,10 +39,10 @@ rt_weak rt_err_t rt_ktime_boottime_get_ns(struct timespec *ts)
3939
{
4040
RT_ASSERT(ts != RT_NULL);
4141

42-
unsigned long ns = (rt_ktime_cputimer_getcnt() * rt_ktime_cputimer_getres()) / RT_KTIME_RESMUL;
42+
rt_uint64_t ns = (rt_ktime_cputimer_getcnt() * rt_ktime_cputimer_getres()) / RT_KTIME_RESMUL;
4343

44-
ts->tv_sec = ns / (1000UL * 1000 * 1000);
45-
ts->tv_nsec = ns % (1000UL * 1000 * 1000);
44+
ts->tv_sec = ns / (1000ULL * 1000 * 1000);
45+
ts->tv_nsec = ns % (1000ULL * 1000 * 1000);
4646

4747
return RT_EOK;
4848
}

‎components/drivers/ktime/src/cputimer.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
#include "ktime.h"
1212

13-
rt_weak unsigned long rt_ktime_cputimer_getres(void)
13+
rt_weak rt_uint64_t rt_ktime_cputimer_getres(void)
1414
{
15-
return ((1000UL * 1000 * 1000) * RT_KTIME_RESMUL) / RT_TICK_PER_SECOND;
15+
return ((1000ULL * 1000 * 1000) * RT_KTIME_RESMUL) / RT_TICK_PER_SECOND;
1616
}
1717

1818
rt_weak unsigned long rt_ktime_cputimer_getfrq(void)

‎components/drivers/ktime/src/hrtimer.c

+58-58
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ static rt_list_t _timer_list = RT_LIST_OBJECT_INIT(_timer_list);
2525
static rt_ktime_hrtimer_t _nowtimer = RT_NULL;
2626
static RT_DEFINE_SPINLOCK(_spinlock);
2727

28-
rt_weak unsigned long rt_ktime_hrtimer_getres(void)
28+
rt_weak rt_uint64_t rt_ktime_hrtimer_getres(void)
2929
{
30-
return ((1000UL * 1000 * 1000) * RT_KTIME_RESMUL) / RT_TICK_PER_SECOND;
30+
return ((1000ULL * 1000 * 1000) * RT_KTIME_RESMUL) / RT_TICK_PER_SECOND;
3131
}
3232

3333
rt_weak unsigned long rt_ktime_hrtimer_getfrq(void)
@@ -181,11 +181,11 @@ void rt_ktime_hrtimer_init(rt_ktime_hrtimer_t timer,
181181
timer->parent.flag = flag;
182182

183183
/* set deactivated */
184-
timer->parent.flag &= ~RT_TIMER_FLAG_ACTIVATED;
185-
timer->timeout_func = timeout;
186-
timer->parameter = parameter;
187-
timer->timeout_cnt = cnt + rt_ktime_cputimer_getcnt();
188-
timer->init_cnt = cnt;
184+
timer->parent.flag &= ~RT_TIMER_FLAG_ACTIVATED;
185+
timer->timeout_func = timeout;
186+
timer->parameter = parameter;
187+
timer->timeout_cnt = cnt + rt_ktime_cputimer_getcnt();
188+
timer->init_cnt = cnt;
189189

190190
rt_list_init(&(timer->row));
191191
rt_completion_init(&timer->completion);
@@ -203,7 +203,7 @@ rt_err_t rt_ktime_hrtimer_start(rt_ktime_hrtimer_t timer)
203203
rt_list_remove(&timer->row); /* remove timer from list */
204204
/* change status of timer */
205205
timer->parent.flag &= ~RT_TIMER_FLAG_ACTIVATED;
206-
timer_list = &_timer_list;
206+
timer_list = &_timer_list;
207207
for (; timer_list != _timer_list.prev; timer_list = timer_list->next)
208208
{
209209
rt_ktime_hrtimer_t t;
@@ -259,58 +259,58 @@ rt_err_t rt_ktime_hrtimer_control(rt_ktime_hrtimer_t timer, int cmd, void *arg)
259259
level = rt_spin_lock_irqsave(&_spinlock);
260260
switch (cmd)
261261
{
262-
case RT_TIMER_CTRL_GET_TIME:
263-
*(unsigned long *)arg = timer->init_cnt;
264-
break;
265-
266-
case RT_TIMER_CTRL_SET_TIME:
267-
RT_ASSERT((*(unsigned long *)arg) < (_HRTIMER_MAX_CNT / 2));
268-
timer->init_cnt = *(unsigned long *)arg;
269-
timer->timeout_cnt = *(unsigned long *)arg + rt_ktime_cputimer_getcnt();
270-
break;
271-
272-
case RT_TIMER_CTRL_SET_ONESHOT:
273-
timer->parent.flag &= ~RT_TIMER_FLAG_PERIODIC;
274-
break;
275-
276-
case RT_TIMER_CTRL_SET_PERIODIC:
277-
timer->parent.flag |= RT_TIMER_FLAG_PERIODIC;
278-
break;
279-
280-
case RT_TIMER_CTRL_GET_STATE:
281-
if (timer->parent.flag & RT_TIMER_FLAG_ACTIVATED)
282-
{
283-
/*timer is start and run*/
284-
*(rt_uint32_t *)arg = RT_TIMER_FLAG_ACTIVATED;
285-
}
286-
else
287-
{
288-
/*timer is stop*/
289-
*(rt_uint32_t *)arg = RT_TIMER_FLAG_DEACTIVATED;
290-
}
291-
break;
262+
case RT_TIMER_CTRL_GET_TIME:
263+
*(unsigned long *)arg = timer->init_cnt;
264+
break;
265+
266+
case RT_TIMER_CTRL_SET_TIME:
267+
RT_ASSERT((*(unsigned long *)arg) < (_HRTIMER_MAX_CNT / 2));
268+
timer->init_cnt = *(unsigned long *)arg;
269+
timer->timeout_cnt = *(unsigned long *)arg + rt_ktime_cputimer_getcnt();
270+
break;
271+
272+
case RT_TIMER_CTRL_SET_ONESHOT:
273+
timer->parent.flag &= ~RT_TIMER_FLAG_PERIODIC;
274+
break;
275+
276+
case RT_TIMER_CTRL_SET_PERIODIC:
277+
timer->parent.flag |= RT_TIMER_FLAG_PERIODIC;
278+
break;
279+
280+
case RT_TIMER_CTRL_GET_STATE:
281+
if (timer->parent.flag & RT_TIMER_FLAG_ACTIVATED)
282+
{
283+
/*timer is start and run*/
284+
*(rt_uint32_t *)arg = RT_TIMER_FLAG_ACTIVATED;
285+
}
286+
else
287+
{
288+
/*timer is stop*/
289+
*(rt_uint32_t *)arg = RT_TIMER_FLAG_DEACTIVATED;
290+
}
291+
break;
292292

293-
case RT_TIMER_CTRL_GET_REMAIN_TIME:
294-
*(unsigned long *)arg = timer->timeout_cnt;
295-
break;
296-
case RT_TIMER_CTRL_GET_FUNC:
297-
arg = (void *)timer->timeout_func;
298-
break;
293+
case RT_TIMER_CTRL_GET_REMAIN_TIME:
294+
*(unsigned long *)arg = timer->timeout_cnt;
295+
break;
296+
case RT_TIMER_CTRL_GET_FUNC:
297+
arg = (void *)timer->timeout_func;
298+
break;
299299

300-
case RT_TIMER_CTRL_SET_FUNC:
301-
timer->timeout_func = (void (*)(void *))arg;
302-
break;
300+
case RT_TIMER_CTRL_SET_FUNC:
301+
timer->timeout_func = (void (*)(void *))arg;
302+
break;
303303

304-
case RT_TIMER_CTRL_GET_PARM:
305-
*(void **)arg = timer->parameter;
306-
break;
304+
case RT_TIMER_CTRL_GET_PARM:
305+
*(void **)arg = timer->parameter;
306+
break;
307307

308-
case RT_TIMER_CTRL_SET_PARM:
309-
timer->parameter = arg;
310-
break;
308+
case RT_TIMER_CTRL_SET_PARM:
309+
timer->parameter = arg;
310+
break;
311311

312-
default:
313-
break;
312+
default:
313+
break;
314314
}
315315
rt_spin_unlock_irqrestore(&_spinlock, level);
316316

@@ -366,8 +366,8 @@ rt_err_t rt_ktime_hrtimer_sleep(struct rt_ktime_hrtimer *timer, unsigned long cn
366366
if (cnt == 0)
367367
return -RT_EINVAL;
368368

369-
timer->timeout_cnt = cnt + rt_ktime_cputimer_getcnt();
370-
timer->init_cnt = cnt;
369+
timer->timeout_cnt = cnt + rt_ktime_cputimer_getcnt();
370+
timer->init_cnt = cnt;
371371

372372
rt_ktime_hrtimer_start(timer); /* reset the timeout of thread timer and start it */
373373
err = rt_completion_wait_flags(&(timer->completion), RT_WAITING_FOREVER,
@@ -379,7 +379,7 @@ rt_err_t rt_ktime_hrtimer_sleep(struct rt_ktime_hrtimer *timer, unsigned long cn
379379

380380
rt_err_t rt_ktime_hrtimer_ndelay(struct rt_ktime_hrtimer *timer, unsigned long ns)
381381
{
382-
unsigned long res = rt_ktime_cputimer_getres();
382+
rt_uint64_t res = rt_ktime_cputimer_getres();
383383
return rt_ktime_hrtimer_sleep(timer, (ns * RT_KTIME_RESMUL) / res);
384384
}
385385

‎components/drivers/ktime/src/risc-v/virt64/cputimer.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
static volatile unsigned long _init_cnt = 0;
1414

15-
unsigned long rt_ktime_cputimer_getres(void)
15+
rt_uint64_t rt_ktime_cputimer_getres(void)
1616
{
17-
return ((1000UL * 1000 * 1000) * RT_KTIME_RESMUL) / CPUTIME_TIMER_FREQ;
17+
return ((1000ULL * 1000 * 1000) * RT_KTIME_RESMUL) / CPUTIME_TIMER_FREQ;
1818
}
1919

2020
unsigned long rt_ktime_cputimer_getfrq(void)

0 commit comments

Comments
 (0)