This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 43f57240e0396b07c6e2e666cc29d8911a025a2b Author: Xiang Xiao <[email protected]> AuthorDate: Wed Feb 23 01:35:23 2022 +0800 Replece clock_gettime(CLOCK_MONOTONIC) with clock_systime_timespec it's better to call the kernrel api insteaad user space api in kernel Signed-off-by: Xiang Xiao <[email protected]> --- arch/arm/src/lc823450/lc823450_dvfs2.c | 2 +- arch/arm/src/lc823450/lc823450_rtc.c | 4 ++-- arch/risc-v/src/esp32c3/esp32c3_i2c.c | 4 ++-- arch/xtensa/src/esp32/esp32_i2c.c | 4 ++-- boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c | 2 +- drivers/sensors/bmp280.c | 2 +- drivers/sensors/ds18b20.c | 2 +- drivers/sensors/hyt271.c | 2 +- drivers/sensors/lis2dh.c | 4 ++-- drivers/sensors/ms5611.c | 2 +- fs/vfs/fs_epoll.c | 4 ++-- include/nuttx/input/touchscreen.h | 2 +- include/nuttx/rc/lirc_dev.h | 2 +- include/nuttx/sensors/sensor.h | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.c b/arch/arm/src/lc823450/lc823450_dvfs2.c index 9a3f71e..46a4ce3 100644 --- a/arch/arm/src/lc823450/lc823450_dvfs2.c +++ b/arch/arm/src/lc823450/lc823450_dvfs2.c @@ -127,7 +127,7 @@ static uint64_t _get_current_time64(void) { struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); + clock_systime_timespec(&ts); return (uint64_t)ts.tv_sec * NSEC_PER_SEC + (uint64_t)ts.tv_nsec; } diff --git a/arch/arm/src/lc823450/lc823450_rtc.c b/arch/arm/src/lc823450/lc823450_rtc.c index 82431f2..0a4d1c5 100644 --- a/arch/arm/src/lc823450/lc823450_rtc.c +++ b/arch/arm/src/lc823450/lc823450_rtc.c @@ -548,7 +548,7 @@ int up_rtc_settime(FAR const struct timespec *ts) up_rtc_set_default_datetime(tp); #endif /* CONFIG_RTC_SAVE_DEFAULT */ - clock_gettime(CLOCK_MONOTONIC, &lastupdate_mono); + clock_systime_timespec(&lastupdate_mono); lastupdate_rtc = *ts; /* Start rtc update */ @@ -660,7 +660,7 @@ int up_rtc_getrawtime(FAR struct timespec *ts) struct timespec now; struct timespec diff; - clock_gettime(CLOCK_MONOTONIC, &now); + clock_systime_timespec(&now); timespec_sub(&now, &lastupdate_mono, &diff); if (lastupdate_rtc.tv_sec != 0 && diff.tv_sec < 1) diff --git a/arch/risc-v/src/esp32c3/esp32c3_i2c.c b/arch/risc-v/src/esp32c3/esp32c3_i2c.c index 84e9540..1fbd8bb 100644 --- a/arch/risc-v/src/esp32c3/esp32c3_i2c.c +++ b/arch/risc-v/src/esp32c3/esp32c3_i2c.c @@ -851,7 +851,7 @@ static int esp32c3_i2c_polling_waitdone(struct esp32c3_i2c_priv_s *priv) * forward and backwards. */ - clock_gettime(CLOCK_MONOTONIC, ¤t_time); + clock_systime_timespec(¤t_time); timeout.tv_sec = current_time.tv_sec + 10; timeout.tv_nsec = current_time.tv_nsec + 0; @@ -892,7 +892,7 @@ static int esp32c3_i2c_polling_waitdone(struct esp32c3_i2c_priv_s *priv) /* Update current time */ - clock_gettime(CLOCK_MONOTONIC, ¤t_time); + clock_systime_timespec(¤t_time); current_us = TIMESPEC_TO_US(current_time.tv_sec, current_time.tv_nsec); } diff --git a/arch/xtensa/src/esp32/esp32_i2c.c b/arch/xtensa/src/esp32/esp32_i2c.c index 2ccaea6..6417d58 100644 --- a/arch/xtensa/src/esp32/esp32_i2c.c +++ b/arch/xtensa/src/esp32/esp32_i2c.c @@ -784,7 +784,7 @@ static int esp32_i2c_polling_waitdone(struct esp32_i2c_priv_s *priv) * forward and backwards. */ - clock_gettime(CLOCK_MONOTONIC, ¤t_time); + clock_systime_timespec(¤t_time); timeout.tv_sec = current_time.tv_sec + 10; timeout.tv_nsec = current_time.tv_nsec + 0; @@ -825,7 +825,7 @@ static int esp32_i2c_polling_waitdone(struct esp32_i2c_priv_s *priv) /* Update current time */ - clock_gettime(CLOCK_MONOTONIC, ¤t_time); + clock_systime_timespec(¤t_time); current_us = TIMESPEC_TO_US(current_time.tv_sec, current_time.tv_nsec); } diff --git a/boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c b/boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c index 365d747..fbda2fe 100644 --- a/boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c +++ b/boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c @@ -118,7 +118,7 @@ static int stm32_cd(int irq, void *context, void *arg) static uint32_t prev = 0; struct timespec tp; - clock_gettime(CLOCK_MONOTONIC, &tp); + clock_systime_timespec(&tp); now = tp.tv_sec * 1000 + tp.tv_nsec / 1000000; /* When inserting card, card detect plate might bounce causing this diff --git a/drivers/sensors/bmp280.c b/drivers/sensors/bmp280.c index e5373a3..703cd8e 100644 --- a/drivers/sensors/bmp280.c +++ b/drivers/sensors/bmp280.c @@ -643,7 +643,7 @@ static int bmp280_fetch(FAR struct sensor_lowerhalf_s *lower, temp = bmp280_compensate_temp(priv, temp); press = bmp280_compensate_press(priv, press); - clock_gettime(CLOCK_MONOTONIC, &ts); + clock_systime_timespec(&ts); baro_data.timestamp = 1000000ull * ts.tv_sec + ts.tv_nsec / 1000; baro_data.pressure = press / 100.0f; diff --git a/drivers/sensors/ds18b20.c b/drivers/sensors/ds18b20.c index a1ff3d7..6067c6b 100644 --- a/drivers/sensors/ds18b20.c +++ b/drivers/sensors/ds18b20.c @@ -550,7 +550,7 @@ static unsigned long ds18b20_curtime(void) { struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); + clock_systime_timespec(&ts); return 1000000ull * ts.tv_sec + ts.tv_nsec / 1000; } diff --git a/drivers/sensors/hyt271.c b/drivers/sensors/hyt271.c index ae9fa92..5d4ea7d 100644 --- a/drivers/sensors/hyt271.c +++ b/drivers/sensors/hyt271.c @@ -188,7 +188,7 @@ static unsigned long hyt271_curtime(void) { struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); + clock_systime_timespec(&ts); return 1000000ull * ts.tv_sec + ts.tv_nsec / 1000; } diff --git a/drivers/sensors/lis2dh.c b/drivers/sensors/lis2dh.c index 211af19..b379bea 100644 --- a/drivers/sensors/lis2dh.c +++ b/drivers/sensors/lis2dh.c @@ -1667,7 +1667,7 @@ static int lis2dh_reboot(FAR struct lis2dh_dev_s *dev) /* Prefer monotonic for timeout calculation when enabled. */ - clock_gettime(CLOCK_MONOTONIC, &start); + clock_systime_timespec(&start); /* Reboot to reset chip. */ @@ -1692,7 +1692,7 @@ static int lis2dh_reboot(FAR struct lis2dh_dev_s *dev) break; } - clock_gettime(CLOCK_MONOTONIC, &curr); + clock_systime_timespec(&curr); diff_msec = (curr.tv_sec - start.tv_sec) * 1000; diff_msec += (curr.tv_nsec - start.tv_nsec) / (1000 * 1000); diff --git a/drivers/sensors/ms5611.c b/drivers/sensors/ms5611.c index 36f8f70..60b321b 100644 --- a/drivers/sensors/ms5611.c +++ b/drivers/sensors/ms5611.c @@ -158,7 +158,7 @@ static unsigned long ms5611_curtime(void) { struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); + clock_systime_timespec(&ts); return 1000000ull * ts.tv_sec + ts.tv_nsec / 1000; } diff --git a/fs/vfs/fs_epoll.c b/fs/vfs/fs_epoll.c index e091e25..c737314 100644 --- a/fs/vfs/fs_epoll.c +++ b/fs/vfs/fs_epoll.c @@ -387,7 +387,7 @@ int epoll_pwait(int epfd, FAR struct epoll_event *evs, expire.tv_sec = timeout / 1000; expire.tv_nsec = timeout % 1000 * 1000; - clock_gettime(CLOCK_MONOTONIC, &curr); + clock_systime_timespec(&curr); clock_timespec_add(&curr, &expire, &expire); } @@ -398,7 +398,7 @@ again: } else { - clock_gettime(CLOCK_MONOTONIC, &curr); + clock_systime_timespec(&curr); clock_timespec_subtract(&expire, &curr, &diff); rc = ppoll(eph->poll, eph->occupied + 1, &diff, sigmask); diff --git a/include/nuttx/input/touchscreen.h b/include/nuttx/input/touchscreen.h index 0836ef1..52fe2aa 100644 --- a/include/nuttx/input/touchscreen.h +++ b/include/nuttx/input/touchscreen.h @@ -204,7 +204,7 @@ static inline uint64_t touch_get_time(void) { struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); + clock_systime_timespec(&ts); return 1000000ull * ts.tv_sec + ts.tv_nsec / 1000; } diff --git a/include/nuttx/rc/lirc_dev.h b/include/nuttx/rc/lirc_dev.h index 4797ba2..dcdc689 100644 --- a/include/nuttx/rc/lirc_dev.h +++ b/include/nuttx/rc/lirc_dev.h @@ -44,7 +44,7 @@ static inline uint64_t lirc_get_timestamp(void) { struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); + clock_systime_timespec(&ts); return 1000000000ull * ts.tv_sec + ts.tv_nsec; } diff --git a/include/nuttx/sensors/sensor.h b/include/nuttx/sensors/sensor.h index 9e1c613..1fe15e3 100644 --- a/include/nuttx/sensors/sensor.h +++ b/include/nuttx/sensors/sensor.h @@ -283,7 +283,7 @@ static inline uint64_t sensor_get_timestamp(void) { struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); + clock_systime_timespec(&ts); return 1000000ull * ts.tv_sec + ts.tv_nsec / 1000; }
