clock: take clock_abstime2ticks() as MARCO

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

Author: GUIDINGLI

include/nuttx/clock.h

@@ -445,6 +445,36 @@ EXTERN volatile clock_t g_system_ticks;
      ((ts1)->tv_sec > (ts2)->tv_sec) ? 1 : \
      (ts1)->tv_nsec - (ts2)->tv_nsec)
 
+/****************************************************************************
+ * Name: clock_abstime2ticks
+ *
+ * Description:
+ *   Convert an absolute timespec delay to system timer ticks.
+ *
+ * Input Parameters:
+ *   clockid - The timing source to use in the conversion
+ *   abstime - Convert this absolute time to ticks
+ *   ticks - Return the converted number of ticks here.
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *   Interrupts should be disabled so that the time is not changing during
+ *   the calculation
+ *
+ ****************************************************************************/
+
+#define clock_abstime2ticks(clockid, abstime, ticks) \
+  do \
+    { \
+      struct timespec _reltime; \
+      nxclock_gettime(clockid, &_reltime); \
+      clock_timespec_subtract(abstime, &_reltime, &_reltime); \
+      *(ticks) = clock_time2ticks(&_reltime); \
+    } \
+  while (0)
+
 /****************************************************************************
  * Name:  clock_isleapyear
  *

sched/clock/CMakeLists.txt

@@ -24,7 +24,6 @@ set(SRCS
     clock_initialize.c
     clock_settime.c
     clock_gettime.c
-    clock_abstime2ticks.c
     clock_systime_ticks.c
     clock_systime_timespec.c)
 

sched/clock/Make.defs

@@ -19,7 +19,7 @@
 ############################################################################
 
 CSRCS += clock.c clock_initialize.c clock_settime.c clock_gettime.c
-CSRCS += clock_abstime2ticks.c clock_systime_ticks.c clock_systime_timespec.c
+CSRCS += clock_systime_ticks.c clock_systime_timespec.c
 CSRCS += clock_perf.c
 
 ifeq ($(CONFIG_CLOCK_TIMEKEEPING),y)

sched/clock/clock.h

@@ -79,10 +79,6 @@ void clock_timer(void);
 #  define clock_timer()
 #endif
 
-int  clock_abstime2ticks(clockid_t clockid,
-                         FAR const struct timespec *abstime,
-                         FAR sclock_t *ticks);
-
 /****************************************************************************
  * perf_init
  ****************************************************************************/

sched/clock/clock_abstime2ticks.c

@@ -177,7 +177,7 @@ file_mq_timedreceive_internal(FAR struct file *mq, FAR char *msg,
                * this time stays valid until the wait begins.
                */
 
-              ret = clock_abstime2ticks(CLOCK_REALTIME, abstime, &ticks);
+              clock_abstime2ticks(CLOCK_REALTIME, abstime, &ticks);
             }
 
           /* Handle any time-related errors */

sched/mqueue/mq_timedreceive.c

@@ -217,7 +217,7 @@ file_mq_timedsend_internal(FAR struct file *mq, FAR const char *msg,
            * begins.
            */
 
-          ret = clock_abstime2ticks(CLOCK_REALTIME, abstime, &ticks);
+          clock_abstime2ticks(CLOCK_REALTIME, abstime, &ticks);
         }
 
       /* Handle any time-related errors */

sched/mqueue/mq_timedsend.c

@@ -93,7 +93,6 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid,
   FAR struct tcb_s *rtcb = this_task();
   irqstate_t flags;
   sclock_t ticks;
-  int status;
   int ret = ERROR;
 
   DEBUGASSERT(sem != NULL && abstime != NULL);
@@ -138,24 +137,16 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid,
    * value on failure.
    */
 
-  status = clock_abstime2ticks(clockid, abstime, &ticks);
+  clock_abstime2ticks(clockid, abstime, &ticks);
 
   /* If the time has already expired return immediately. */
 
-  if (status == OK && ticks <= 0)
+  if (ticks <= 0)
     {
       ret = -ETIMEDOUT;
       goto out;
     }
 
-  /* Handle any time-related errors */
-
-  if (status != OK)
-    {
-      ret = -status;
-      goto out;
-    }
-
   /* Start the watchdog */
 
   wd_start(&rtcb->waitdog, ticks, nxsem_timeout, nxsched_gettid());

sched/semaphore/sem_clockwait.c

@@ -292,7 +292,7 @@ int timer_settime(timer_t timerid, int flags,
     {
       /* Calculate a delay corresponding to the absolute time in 'value' */
 
-      ret = clock_abstime2ticks(timer->pt_clock, &value->it_value, &delay);
+      clock_abstime2ticks(timer->pt_clock, &value->it_value, &delay);
     }
   else
     {
@@ -304,11 +304,6 @@ int timer_settime(timer_t timerid, int flags,
       delay = clock_time2ticks(&value->it_value);
     }
 
-  if (ret < 0)
-    {
-      goto errout;
-    }
-
   /* If the specified time has already passed, the function shall succeed
    * and the expiration notification shall be made.
    */
@@ -325,7 +320,6 @@ int timer_settime(timer_t timerid, int flags,
       ret = wd_start(&timer->pt_wdog, delay, timer_timeout, (wdparm_t)timer);
     }
 
-errout:
   leave_critical_section(intflags);
 
   if (ret < 0)