posix: use kernel k_clock implementation

Use the newly added k_clock API in the kernel for

* clock_gettime()
* clock_settime()
* clock_nanosleep() and nanosleep()
* gettimeofday()

Signed-off-by: Chris Friedt <[email protected]>

Author: cfriedt

include/zephyr/posix/time.h

@@ -66,7 +66,7 @@ extern "C" {
 #endif
 
 #ifndef CLOCK_REALTIME
-#define CLOCK_REALTIME 1
+#define CLOCK_REALTIME K_CLOCK_REALTIME
 #endif
 
 #ifndef CLOCK_PROCESS_CPUTIME_ID
@@ -78,7 +78,7 @@ extern "C" {
 #endif
 
 #ifndef CLOCK_MONOTONIC
-#define CLOCK_MONOTONIC 4
+#define CLOCK_MONOTONIC K_CLOCK_MONOTONIC
 #endif
 
 #ifndef TIMER_ABSTIME

lib/posix/options/CMakeLists.txt

@@ -2,10 +2,6 @@
 
 set(GEN_DIR ${ZEPHYR_BINARY_DIR}/include/generated)
 
-zephyr_syscall_header_ifdef(CONFIG_POSIX_CLOCK_SELECTION posix_clock.h)
-zephyr_syscall_header_ifdef(CONFIG_POSIX_TIMERS posix_clock.h)
-zephyr_syscall_header_ifdef(CONFIG_XSI_SINGLE_PROCESS posix_clock.h)
-
 if(CONFIG_POSIX_API)
   zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/posix)
 endif()
@@ -47,10 +43,7 @@ if (NOT CONFIG_TC_PROVIDES_POSIX_BARRIERS)
 endif()
 
 if (NOT CONFIG_TC_PROVIDES_POSIX_CLOCK_SELECTION)
-  zephyr_library_sources_ifdef(CONFIG_POSIX_CLOCK_SELECTION
-    clock_common.c
-    clock_selection.c
-  )
+  zephyr_library_sources_ifdef(CONFIG_POSIX_CLOCK_SELECTION clock_selection.c)
 endif()
 
 if (NOT CONFIG_TC_PROVIDES_POSIX_C_LIB_EXT)
@@ -124,7 +117,6 @@ endif()
 if (NOT CONFIG_TC_PROVIDES_POSIX_TIMERS)
   zephyr_library_sources_ifdef(CONFIG_POSIX_TIMERS
     clock.c
-    clock_common.c
     timer.c
     timespec_to_timeout.c
   )
@@ -166,7 +158,6 @@ zephyr_library_sources_ifdef(CONFIG_XOPEN_STREAMS stropts.c)
 
 if (NOT CONFIG_TC_PROVIDES_XSI_SINGLE_PROCESS)
   zephyr_library_sources_ifdef(CONFIG_XSI_SINGLE_PROCESS
-    clock_common.c
     env_common.c
     xsi_single_process.c
   )

lib/posix/options/clock.c

@@ -8,18 +8,22 @@
 #include <errno.h>
 #include <time.h>
 
+#include <zephyr/kernel.h>
 #include <zephyr/posix/time.h>
 #include <zephyr/posix/sys/time.h>
 #include <zephyr/posix/unistd.h>
 
-extern int z_clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp,
-			     struct timespec *rmtp);
-extern int z_clock_gettime(clockid_t clock_id, struct timespec *ts);
-extern int z_clock_settime(clockid_t clock_id, const struct timespec *tp);
-
 int clock_gettime(clockid_t clock_id, struct timespec *ts)
 {
-	return z_clock_gettime(clock_id, ts);
+	int ret;
+
+	ret = k_clock_gettime(clock_id, ts);
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
+
+	return 0;
 }
 
 int clock_getres(clockid_t clock_id, struct timespec *res)
@@ -54,7 +58,15 @@ int clock_getres(clockid_t clock_id, struct timespec *res)
  */
 int clock_settime(clockid_t clock_id, const struct timespec *tp)
 {
-	return z_clock_settime(clock_id, tp);
+	int ret;
+
+	ret = k_clock_settime(clock_id, tp);
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
+
+	return 0;
 }
 
 /*
@@ -88,7 +100,20 @@ int usleep(useconds_t useconds)
 
 int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
 {
-	return z_clock_nanosleep(CLOCK_MONOTONIC, 0, rqtp, rmtp);
+	int ret;
+
+	if (rqtp == NULL) {
+		errno = EFAULT;
+		return -1;
+	}
+
+	ret = k_clock_nanosleep(K_CLOCK_MONOTONIC, 0, rqtp, rmtp);
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
+
+	return 0;
 }
 
 int clock_getcpuclockid(pid_t pid, clockid_t *clock_id)

lib/posix/options/clock_common.c

@@ -15,13 +15,23 @@
 #include <zephyr/posix/time.h>
 #include <zephyr/toolchain.h>
 
-extern int z_clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp,
-			     struct timespec *rmtp);
-
-extern int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp,
-			   struct timespec *rmtp)
+int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp,
+		    struct timespec *rmtp)
 {
-	return z_clock_nanosleep(clock_id, flags, rqtp, rmtp);
+	int ret;
+
+	if (rqtp == NULL) {
+		errno = EFAULT;
+		return -1;
+	}
+
+	ret = k_clock_nanosleep((int)clock_id, flags, rqtp, rmtp);
+	if (ret < 0) {
+		errno = -ret;
+		return -1;
+	}
+
+	return 0;
 }
 
 int pthread_condattr_getclock(const pthread_condattr_t *ZRESTRICT att,

lib/posix/options/clock_selection.c

@@ -61,12 +61,8 @@ static inline bool tp_diff_in_range_ns(const struct timespec *a, const struct ti
 
 uint32_t timespec_to_timeoutms(clockid_t clock_id, const struct timespec *abstime);
 
-__syscall int __posix_clock_get_base(clockid_t clock_id, struct timespec *ts);
-
 /** INTERNAL_HIDDEN @endcond */
 
-#include <zephyr/syscalls/posix_clock.h>
-
 #ifdef __cplusplus
 }
 #endif