clock: Replace all ts and tick conversion functions

Using the ts/tick conversion functions provided in clock.h

Do this caused we want speed up the time calculation, so change:
clock_time2ticks, clock_ticks2time, clock_timespec_add,
clock_timespec_compare, clock_timespec_subtract... to MACRO

Signed-off-by: ligd <liguiding1@xiaomi.com>

Author: GUIDINGLI

arch/risc-v/src/bl602/bl602_os_hal.c

@@ -989,7 +989,6 @@ int bl_os_timer_start_once(void *timerid, long t_sec, long t_nsec)
 {
   struct timer_adpt *timer;
   struct timespec reltime;
-  int32_t tick;
 
   timer = (struct timer_adpt *)timerid;
 
@@ -1001,10 +1000,8 @@ int bl_os_timer_start_once(void *timerid, long t_sec, long t_nsec)
   reltime.tv_nsec = t_nsec;
   reltime.tv_sec = t_sec;
 
-  clock_time2ticks(&reltime, &tick);
-
   timer->mode = BL_OS_TIEMR_ONCE;
-  timer->delay = tick;
+  timer->delay = clock_time2ticks(&reltime);
 
   return wd_start(&timer->wdog,
                   timer->delay,
@@ -1027,7 +1024,6 @@ int bl_os_timer_start_periodic(void *timerid, long t_sec, long t_nsec)
 {
   struct timer_adpt *timer;
   struct timespec reltime;
-  int32_t tick;
 
   timer = (struct timer_adpt *)timerid;
 
@@ -1039,10 +1035,8 @@ int bl_os_timer_start_periodic(void *timerid, long t_sec, long t_nsec)
   reltime.tv_nsec = t_nsec;
   reltime.tv_sec = t_sec;
 
-  clock_time2ticks(&reltime, &tick);
-
   timer->mode = BL_OS_TIEMR_CYCLE;
-  timer->delay = tick;
+  timer->delay = clock_time2ticks(&reltime);
 
   return wd_start(&timer->wdog,
                   timer->delay,

drivers/timers/arch_alarm.c

@@ -36,9 +36,6 @@
 #define CONFIG_BOARD_LOOPSPER10USEC  ((CONFIG_BOARD_LOOPSPERMSEC+50)/100)
 #define CONFIG_BOARD_LOOPSPERUSEC    ((CONFIG_BOARD_LOOPSPERMSEC+500)/1000)
 
-#define timespec_to_nsec(ts) \
-    ((uint64_t)(ts)->tv_sec * NSEC_PER_SEC + (ts)->tv_nsec)
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -53,22 +50,14 @@ static clock_t g_current_tick;
  * Private Functions
  ****************************************************************************/
 
-static inline void timespec_from_nsec(FAR struct timespec *ts,
-                                      uint64_t nanoseconds)
-{
-  ts->tv_sec    = nanoseconds / NSEC_PER_SEC;
-  nanoseconds -= (uint64_t)ts->tv_sec * NSEC_PER_SEC;
-  ts->tv_nsec   = nanoseconds;
-}
-
 static void udelay_accurate(useconds_t microseconds)
 {
   struct timespec now;
   struct timespec end;
   struct timespec delta;
 
   ONESHOT_CURRENT(g_oneshot_lower, &now);
-  timespec_from_nsec(&delta, (uint64_t)microseconds * NSEC_PER_USEC);
+  clock_nsec2time(&delta, (uint64_t)microseconds * NSEC_PER_USEC);
   clock_timespec_add(&now, &delta, &end);
 
   while (clock_timespec_compare(&now, &end) < 0)
@@ -375,7 +364,7 @@ unsigned long up_perf_gettime(void)
       struct timespec ts;
 
       ONESHOT_CURRENT(g_oneshot_lower, &ts);
-      ret = timespec_to_nsec(&ts);
+      ret = clock_time2nsec(&ts);
     }
 
   return ret;
@@ -388,7 +377,7 @@ unsigned long up_perf_getfreq(void)
 
 void up_perf_convert(unsigned long elapsed, FAR struct timespec *ts)
 {
-  timespec_from_nsec(ts, elapsed);
+  clock_nsec2time(ts, elapsed);
 }
 #endif /* CONFIG_ARCH_PERF_EVENTS */
 

drivers/timers/arch_timer.c

@@ -61,14 +61,6 @@ static struct arch_timer_s g_timer;
  * Private Functions
  ****************************************************************************/
 
-static inline void timespec_from_usec(FAR struct timespec *ts,
-                                      uint64_t microseconds)
-{
-  ts->tv_sec    = microseconds / USEC_PER_SEC;
-  microseconds -= (uint64_t)ts->tv_sec * USEC_PER_SEC;
-  ts->tv_nsec   = microseconds * NSEC_PER_USEC;
-}
-
 #ifdef CONFIG_SCHED_TICKLESS
 
 static uint32_t update_timeout(uint32_t timeout)
@@ -421,7 +413,7 @@ unsigned long up_perf_getfreq(void)
 void up_perf_convert(unsigned long elapsed,
                      FAR struct timespec *ts)
 {
-  timespec_from_usec(ts, elapsed);
+  clock_usec2time(ts, elapsed);
 }
 #endif /* CONFIG_ARCH_PERF_EVENTS */
 

fs/vfs/fs_timerfd.c

@@ -535,8 +535,8 @@ int timerfd_settime(int fd, int flags,
 
       /* Convert that to a struct timespec and return it */
 
-      clock_ticks2time(delay, &old_value->it_value);
-      clock_ticks2time(dev->delay, &old_value->it_interval);
+      clock_ticks2time(&old_value->it_value, delay);
+      clock_ticks2time(&old_value->it_interval, dev->delay);
     }
 
   /* Disarm the timer (in case the timer was already armed when
@@ -561,7 +561,7 @@ int timerfd_settime(int fd, int flags,
 
   /* Setup up any repetitive timer */
 
-  clock_time2ticks(&new_value->it_interval, &delay);
+  delay = clock_time2ticks(&new_value->it_interval);
   dev->delay = delay;
 
   /* We need to disable timer interrupts through the following section so
@@ -583,7 +583,7 @@ int timerfd_settime(int fd, int flags,
        * returns success.
        */
 
-      clock_time2ticks(&new_value->it_value, &delay);
+      delay = clock_time2ticks(&new_value->it_value);
     }
 
   /* If the time is in the past or now, then set up the next interval
@@ -651,8 +651,8 @@ int timerfd_gettime(int fd, FAR struct itimerspec *curr_value)
 
   /* Convert that to a struct timespec and return it */
 
-  clock_ticks2time(ticks, &curr_value->it_value);
-  clock_ticks2time(dev->delay, &curr_value->it_interval);
+  clock_ticks2time(&curr_value->it_value, ticks);
+  clock_ticks2time(&curr_value->it_interval, dev->delay);
   return OK;
 
 errout:

include/nuttx/clock.h

@@ -325,7 +325,7 @@ EXTERN volatile clock_t g_system_ticks;
  * Public Function Prototypes
  ****************************************************************************/
 
-#define timespec_from_tick(ts, tick) \
+#define clock_ticks2time(ts, tick) \
   do \
     { \
       clock_t _tick = (tick); \
@@ -335,9 +335,35 @@ EXTERN volatile clock_t g_system_ticks;
     } \
   while (0)
 
-#define timespec_to_tick(ts) \
+#define clock_time2ticks(ts) \
   ((clock_t)(ts)->tv_sec * TICK_PER_SEC + (ts)->tv_nsec / NSEC_PER_TICK)
 
+#define clock_usec2time(ts, usec) \
+  do \
+    { \
+      uint64_t _usec = (usec); \
+      (ts)->tv_sec = _usec / USEC_PER_SEC; \
+      _usec -= (uint64_t)(ts)->tv_sec * USEC_PER_SEC; \
+      (ts)->tv_nsec = _usec * NSEC_PER_USEC; \
+    } \
+  while (0)
+
+#define clock_time2usec(ts) \
+  ((uint64_t)(ts)->tv_sec * USEC_PER_SEC + (ts)->tv_nsec / NSEC_PER_USEC)
+
+#define clock_nsec2time(ts, nsec) \
+  do \
+    { \
+      uint64_t _nsec = (nsec); \
+      (ts)->tv_sec = _nsec / NSEC_PER_SEC; \
+      _nsec -= (uint64_t)(ts)->tv_sec * NSEC_PER_SEC; \
+      (ts)->tv_nsec = _nsec; \
+    } \
+  while (0)
+
+#define clock_time2nsec(ts) \
+  ((uint64_t)(ts)->tv_sec * NSEC_PER_SEC + (ts)->tv_nsec)
+
 /****************************************************************************
  * Name:  clock_timespec_add
  *
@@ -561,51 +587,6 @@ void clock_resynchronize(FAR struct timespec *rtc_diff);
 clock_t clock_systime_ticks(void);
 #endif
 
-/****************************************************************************
- * Name: clock_time2ticks
- *
- * Description:
- *   Return the given struct timespec as systime ticks.
- *
- *   NOTE:  This is an internal OS interface and should not be called from
- *   application code.
- *
- * Input Parameters:
- *   reltime - Pointer to the time presented as struct timespec
- *
- * Output Parameters:
- *   ticks - Pointer to receive the time value presented as systime ticks
- *
- * Returned Value:
- *   Always returns OK (0)
- *
- ****************************************************************************/
-
-int clock_time2ticks(FAR const struct timespec *reltime,
-                     FAR sclock_t *ticks);
-
-/****************************************************************************
- * Name: clock_ticks2time
- *
- * Description:
- *   Return the given systime ticks as a struct timespec.
- *
- *   NOTE:  This is an internal OS interface and should not be called from
- *   application code.
- *
- * Input Parameters:
- *   ticks - Time presented as systime ticks
- *
- * Output Parameters:
- *   reltime - Pointer to receive the time value presented as struct timespec
- *
- * Returned Value:
- *   Always returns OK (0)
- *
- ****************************************************************************/
-
-int clock_ticks2time(sclock_t ticks, FAR struct timespec *reltime);
-
 /****************************************************************************
  * Name: clock_systime_timespec
  *

include/nuttx/timers/oneshot.h

@@ -270,7 +270,7 @@ int oneshot_max_delay(FAR struct oneshot_lowerhalf_s *lower,
   DEBUGASSERT(lower->ops->tick_max_delay);
 
   ret = lower->ops->tick_max_delay(lower, &tick);
-  timespec_from_tick(ts, tick);
+  clock_ticks2time(ts, tick);
   return ret;
 }
 
@@ -283,7 +283,7 @@ int oneshot_start(FAR struct oneshot_lowerhalf_s *lower,
 
   DEBUGASSERT(lower->ops->tick_start);
 
-  tick = timespec_to_tick(ts);
+  tick = clock_time2ticks(ts);
   return lower->ops->tick_start(lower, callback, arg, tick);
 }
 
@@ -297,7 +297,7 @@ int oneshot_cancel(FAR struct oneshot_lowerhalf_s *lower,
   DEBUGASSERT(lower->ops->tick_cancel);
 
   ret = lower->ops->tick_cancel(lower, &tick);
-  timespec_from_tick(ts, tick);
+  clock_ticks2time(ts, tick);
 
   return ret;
 }
@@ -312,7 +312,7 @@ int oneshot_current(FAR struct oneshot_lowerhalf_s *lower,
   DEBUGASSERT(lower->ops->tick_current);
 
   ret = lower->ops->tick_current(lower, &tick);
-  timespec_from_tick(ts, tick);
+  clock_ticks2time(ts, tick);
 
   return ret;
 }
@@ -327,7 +327,7 @@ int oneshot_tick_max_delay(FAR struct oneshot_lowerhalf_s *lower,
   DEBUGASSERT(lower->ops->max_delay);
 
   ret = lower->ops->max_delay(lower, &ts);
-  *ticks = timespec_to_tick(&ts);
+  *ticks = clock_time2ticks(&ts);
   return ret;
 }
 
@@ -340,7 +340,7 @@ int oneshot_tick_start(FAR struct oneshot_lowerhalf_s *lower,
 
   DEBUGASSERT(lower->ops->start);
 
-  timespec_from_tick(&ts, ticks);
+  clock_ticks2time(&ts, ticks);
   return lower->ops->start(lower, callback, arg, &ts);
 }
 
@@ -354,7 +354,7 @@ int oneshot_tick_cancel(FAR struct oneshot_lowerhalf_s *lower,
   DEBUGASSERT(lower->ops->cancel);
 
   ret = lower->ops->cancel(lower, &ts);
-  *ticks = timespec_to_tick(&ts);
+  *ticks = clock_time2ticks(&ts);
 
   return ret;
 }
@@ -369,7 +369,7 @@ int oneshot_tick_current(FAR struct oneshot_lowerhalf_s *lower,
   DEBUGASSERT(lower->ops->current);
 
   ret = lower->ops->current(lower, &ts);
-  *ticks = timespec_to_tick(&ts);
+  *ticks = clock_time2ticks(&ts);
 
   return ret;
 }

libs/libc/misc/lib_mutex.c

@@ -353,7 +353,7 @@ int nxmutex_timedlock(FAR mutex_t *mutex, unsigned int timeout)
   struct timespec rqtp;
 
   clock_gettime(CLOCK_MONOTONIC, &now);
-  clock_ticks2time(MSEC2TICK(timeout), &delay);
+  clock_ticks2time(&delay, MSEC2TICK(timeout));
   clock_timespec_add(&now, &delay, &rqtp);
 
   /* Wait until we get the lock or until the timeout expires */

libs/libc/sched/CMakeLists.txt

@@ -21,8 +21,6 @@
 set(SRCS
     sched_getprioritymax.c
     sched_getprioritymin.c
-    clock_ticks2time.c
-    clock_time2ticks.c
     clock_getcpuclockid.c
     clock_getres.c
     task_cancelpt.c

libs/libc/sched/Make.defs

@@ -21,7 +21,6 @@
 # Add the sched C files to the build
 
 CSRCS += sched_getprioritymax.c sched_getprioritymin.c
-CSRCS += clock_ticks2time.c clock_time2ticks.c
 CSRCS += clock_getcpuclockid.c clock_getres.c
 CSRCS += task_cancelpt.c task_setcancelstate.c task_setcanceltype.c
 CSRCS += task_testcancel.c