stashing

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

Author: cfriedt

include/zephyr/posix/posix_features.h

@@ -90,9 +90,9 @@
 #define _POSIX_MESSAGE_PASSING _POSIX_VERSION
 #endif
 
-#ifdef CONFIG_POSIX_MONOTONIC_CLOCK
-#define _POSIX_MONOTONIC_CLOCK _POSIX_VERSION
-#endif
+// #ifdef CONFIG_POSIX_MONOTONIC_CLOCK
+// #define _POSIX_MONOTONIC_CLOCK _POSIX_VERSION
+// #endif
 
 /* #define _POSIX_PRIORITIZED_IO (-1L) */
 
@@ -177,9 +177,9 @@
 #define _POSIX_TIMEOUTS _POSIX_VERSION
 #endif
 
-#ifdef CONFIG_POSIX_TIMERS
-#define _POSIX_TIMERS _POSIX_VERSION
-#endif
+// #ifdef CONFIG_POSIX_TIMERS
+// #define _POSIX_TIMERS _POSIX_VERSION
+// #endif
 
 /* #define _POSIX_TRACE (-1L) */
 /* #define _POSIX_TRACE_EVENT_FILTER (-1L) */

lib/libc/minimal/source/time/gmtime.c

@@ -4,7 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200809L
 #include <time.h>
+
 #include <zephyr/sys/libc-hooks.h>
 
 #ifdef CONFIG_MINIMAL_LIBC_NON_REENTRANT_FUNCTIONS

lib/libc/newlib/CMakeLists.txt

@@ -49,3 +49,12 @@ if(CONFIG_NEWLIB_LIBC_NANO)
     -specs=nano.specs
     )
 endif()
+
+if(CONFIG_POSIX_API)
+  set(POSIX_VERSION 200809L)
+  zephyr_compile_options(
+    -U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=${POSIX_VERSION}
+    -U_POSIX_TIMERS -D_POSIX_TIMERS=${POSIX_VERSION}
+    -U__POSIX_VISIBLE -D__POSIX_VISIBLE=${POSIX_VERSION}
+  )
+endif()

lib/posix/options/CMakeLists.txt

@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
+set(POSIX_VERSION 200809L)
+set(XOPEN_VERSION 700)
+
 set(GEN_DIR ${ZEPHYR_BINARY_DIR}/include/generated)
 
 zephyr_syscall_header_ifdef(CONFIG_POSIX_CLOCK_SELECTION posix_clock.h)
@@ -8,6 +11,9 @@ zephyr_syscall_header_ifdef(CONFIG_XSI_SINGLE_PROCESS posix_clock.h)
 
 if(CONFIG_POSIX_SYSTEM_HEADERS)
   zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/posix)
+  zephyr_compile_options(
+    -U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=${POSIX_VERSION}
+  )
 endif()
 
 if (NOT CONFIG_TC_PROVIDES_POSIX_SIGNALS)
@@ -125,6 +131,12 @@ if (NOT CONFIG_TC_PROVIDES_POSIX_TIMERS)
     timespec_to_timeout.c
   )
 endif()
+zephyr_compile_options_ifdef(CONFIG_POSIX_TIMERS
+  -U_POSIX_TIMERS -D_POSIX_TIMERS=${POSIX_VERSION}
+  # Technically _POSIX_MONOTONIC_CLOCK should be selected by CONFIG_POSIX_ADVANCED_REALTIME
+  # See https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap02.html
+  -U_POSIX_MONOTONIC_CLOCK -D_POSIX_MONOTONIC_CLOCK=${POSIX_VERSION}
+)
 
 if (NOT CONFIG_TC_PROVIDES_POSIX_READER_WRITER_LOCKS)
   # Note: the Option is _POSIX_READER_WRITER_LOCKS, while the Option Group is POSIX_RW_LOCKS.

lib/posix/options/clock.c

@@ -33,8 +33,17 @@ int clock_getres(clockid_t clock_id, struct timespec *res)
 			     CONFIG_SYS_CLOCK_TICKS_PER_SEC <= NSEC_PER_SEC,
 		     "CONFIG_SYS_CLOCK_TICKS_PER_SEC must be > 0 and <= NSEC_PER_SEC");
 
-	if (!(clock_id == CLOCK_MONOTONIC || clock_id == CLOCK_REALTIME ||
-	      clock_id == CLOCK_PROCESS_CPUTIME_ID)) {
+	if (!(
+/* FIXME: this should check CONFIG_POSIX_ADVANCED_REALTIME */
+#if defined(_POSIX_MONOTONIC_CLOCK)
+		    clock_id == CLOCK_MONOTONIC ||
+#endif
+		    clock_id == CLOCK_REALTIME ||
+/* FIXME: this should check CONFIG_POSIX_ADVANCED_REALTIME */
+#if defined(_POSIX_CPUTIME)
+		    clock_id == CLOCK_PROCESS_CPUTIME_ID ||
+#endif
+		    false)) {
 		errno = EINVAL;
 		return -1;
 	}
@@ -117,6 +126,8 @@ int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
 	return 0;
 }
 
+/* FIXME: this should check CONFIG_POSIX_ADVANCED_REALTIME */
+#if defined(_POSIX_CPUTIME)
 int clock_getcpuclockid(pid_t pid, clockid_t *clock_id)
 {
 	/* We don't allow any process ID but our own.  */
@@ -128,3 +139,4 @@ int clock_getcpuclockid(pid_t pid, clockid_t *clock_id)
 
 	return 0;
 }
+#endif

tests/posix/timers/src/clock.c

@@ -157,8 +157,10 @@ ZTEST(posix_timers, test_realtime)
 	zassert_between_inclusive(cma, lo, hi);
 }
 
+/* FIXME: this should be moved to a testsuite called advanced_realtime */
 ZTEST(posix_timers, test_clock_getcpuclockid)
 {
+#ifdef _POSIX_CPUTIME
 	int ret = 0;
 	clockid_t clock_id = CLOCK_INVALID;
 
@@ -168,6 +170,7 @@ ZTEST(posix_timers, test_clock_getcpuclockid)
 
 	ret = clock_getcpuclockid((pid_t)2482, &clock_id);
 	zassert_equal(ret, EPERM, "POSIX clock_getcpuclock id failed");
+#endif
 }
 
 ZTEST(posix_timers, test_clock_getres)
@@ -190,13 +193,21 @@ ZTEST(posix_timers, test_clock_getres)
 		{CLOCK_INVALID, NULL, -1},
 		{CLOCK_INVALID, &res, -1},
 		{CLOCK_REALTIME, NULL, 0},
+#if defined(_POSIX_MONOTONIC_CLOCK)
 		{CLOCK_MONOTONIC, NULL, 0},
+#endif
+#if defined(_POSIX_CPUTIME)
 		{CLOCK_PROCESS_CPUTIME_ID, NULL, 0},
+#endif
 
 		/* all valid inputs */
 		{CLOCK_REALTIME, &res, 0},
+#if defined(_POSIX_MONOTONIC_CLOCK)
 		{CLOCK_MONOTONIC, &res, 0},
+#endif
+#if defined(_POSIX_CPUTIME)
 		{CLOCK_PROCESS_CPUTIME_ID, &res, 0},
+#endif
 	};
 
 	ARRAY_FOR_EACH_PTR(args, arg) {

tests/posix/timers/src/timer.c

@@ -9,6 +9,7 @@
 
 #include <zephyr/ztest.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/posix/signal.h>
 
 #define SECS_TO_SLEEP  2
 #define DURATION_SECS  1