clock: take clock_timespec_compare/add/subtract() as MACRO

Signed-off-by: ligd <[email protected]>

Author: GUIDINGLI

include/nuttx/clock.h

@@ -338,19 +338,6 @@ EXTERN volatile clock_t g_system_ticks;
 #define timespec_to_tick(ts) \
   ((clock_t)(ts)->tv_sec * TICK_PER_SEC + (ts)->tv_nsec / NSEC_PER_TICK)
 
-/****************************************************************************
- * Name: clock_timespec_compare
- *
- * Description:
- *    Return < 0 if time ts1 is before time ts2
- *    Return > 0 if time ts2 is before time ts1
- *    Return 0 if time ts1 is the same as time ts2
- *
- ****************************************************************************/
-
-int clock_timespec_compare(FAR const struct timespec *ts1,
-                           FAR const struct timespec *ts2);
-
 /****************************************************************************
  * Name:  clock_timespec_add
  *
@@ -366,9 +353,20 @@ int clock_timespec_compare(FAR const struct timespec *ts1,
  *
  ****************************************************************************/
 
-void clock_timespec_add(FAR const struct timespec *ts1,
-                        FAR const struct timespec *ts2,
-                        FAR struct timespec *ts3);
+#define clock_timespec_add(ts1, ts2, ts3) \
+  do \
+    { \
+      time_t _sec = (ts1)->tv_sec + (ts2)->tv_sec; \
+      long _nsec = (ts1)->tv_nsec + (ts2)->tv_nsec; \
+      if (_nsec >= NSEC_PER_SEC) \
+          { \
+          _nsec -= NSEC_PER_SEC; \
+          _sec++; \
+          } \
+      (ts3)->tv_sec = _sec; \
+      (ts3)->tv_nsec = _nsec; \
+    }\
+  while (0)
 
 /****************************************************************************
  * Name:  clock_timespec_subtract
@@ -386,9 +384,40 @@ void clock_timespec_add(FAR const struct timespec *ts1,
  *
  ****************************************************************************/
 
-void clock_timespec_subtract(FAR const struct timespec *ts1,
-                             FAR const struct timespec *ts2,
-                             FAR struct timespec *ts3);
+#define clock_timespec_subtract(ts1, ts2, ts3) \
+    do \
+        { \
+        time_t _sec = (ts1)->tv_sec - (ts2)->tv_sec; \
+        long _nsec = (ts1)->tv_nsec - (ts2)->tv_nsec; \
+        if (_nsec < 0) \
+            { \
+            _nsec += NSEC_PER_SEC; \
+            _sec--; \
+            } \
+        if (_sec < 0) \
+            { \
+            _sec = 0; \
+            _nsec = 0; \
+            } \
+        (ts3)->tv_sec = _sec; \
+        (ts3)->tv_nsec = _nsec; \
+        }\
+    while (0)
+
+/****************************************************************************
+ * Name: clock_timespec_compare
+ *
+ * Description:
+ *    Return < 0 if time ts1 is before time ts2
+ *    Return > 0 if time ts2 is before time ts1
+ *    Return 0 if time ts1 is the same as time ts2
+ *
+ ****************************************************************************/
+
+#define clock_timespec_compare(ts1, ts2) \
+    (((ts1)->tv_sec < (ts2)->tv_sec) ? -1 : \
+     ((ts1)->tv_sec > (ts2)->tv_sec) ? 1 : \
+     (ts1)->tv_nsec - (ts2)->tv_nsec)
 
 /****************************************************************************
  * Name:  clock_isleapyear

libs/libc/sched/CMakeLists.txt

@@ -23,8 +23,6 @@ set(SRCS
     sched_getprioritymin.c
     clock_ticks2time.c
     clock_time2ticks.c
-    clock_timespec_add.c
-    clock_timespec_subtract.c
     clock_getcpuclockid.c
     clock_getres.c
     task_cancelpt.c

libs/libc/sched/Make.defs

@@ -22,7 +22,6 @@
 
 CSRCS += sched_getprioritymax.c sched_getprioritymin.c
 CSRCS += clock_ticks2time.c clock_time2ticks.c
-CSRCS += clock_timespec_add.c clock_timespec_subtract.c
 CSRCS += clock_getcpuclockid.c clock_getres.c
 CSRCS += task_cancelpt.c task_setcancelstate.c task_setcanceltype.c
 CSRCS += task_testcancel.c

libs/libc/sched/clock_timespec_add.c

@@ -33,32 +33,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: clock_timespec_compare
- *
- * Description:
- *    Return < 0 if time a is before time b
- *    Return > 0 if time b is before time a
- *    Return 0 if time a is the same as time b
- *
- ****************************************************************************/
-
-int clock_timespec_compare(FAR const struct timespec *a,
-                           FAR const struct timespec *b)
-{
-  if (a->tv_sec < b->tv_sec)
-    {
-      return -1;
-    }
-
-  if (a->tv_sec > b->tv_sec)
-    {
-      return 1;
-    }
-
-  return a->tv_nsec - b->tv_nsec;
-}
-
 /****************************************************************************
  * Name: clock_abstime2ticks
  *