posix: remove usage of CONFIG_POSIX_API

Remove usage of CONFIG_POSIX_API.

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

Author: cfriedt

include/zephyr/net/socket.h

@@ -374,7 +374,7 @@ __syscall void *zsock_get_context_object(int sock);
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/socket.html
  * for normative description.
  * This function is also exposed as `socket()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  *
  * If CONFIG_USERSPACE is enabled, the caller will be granted access to the
  * context object associated with the returned file descriptor.
@@ -391,7 +391,7 @@ __syscall int zsock_socket(int family, int type, int proto);
  * https://pubs.opengroup.org/onlinepubs/009695399/functions/socketpair.html
  * for normative description.
  * This function is also exposed as `socketpair()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_socketpair(int family, int type, int proto, int *sv);
 
@@ -401,7 +401,7 @@ __syscall int zsock_socketpair(int family, int type, int proto, int *sv);
  * @details
  * Close a network socket.
  * This function is also exposed as `close()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case it
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined (in which case it
  * may conflict with generic POSIX `close()` function).
  */
 __syscall int zsock_close(int sock);
@@ -415,7 +415,7 @@ __syscall int zsock_close(int sock);
  * for normative description, but currently this function has no effect in
  * Zephyr and provided solely for compatibility with existing code.
  * This function is also exposed as `shutdown()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_shutdown(int sock, int how);
 
@@ -427,7 +427,7 @@ __syscall int zsock_shutdown(int sock, int how);
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/bind.html
  * for normative description.
  * This function is also exposed as `bind()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_bind(int sock, const struct sockaddr *addr,
 			 socklen_t addrlen);
@@ -440,7 +440,7 @@ __syscall int zsock_bind(int sock, const struct sockaddr *addr,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/connect.html
  * for normative description.
  * This function is also exposed as `connect()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_connect(int sock, const struct sockaddr *addr,
 			    socklen_t addrlen);
@@ -453,7 +453,7 @@ __syscall int zsock_connect(int sock, const struct sockaddr *addr,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html
  * for normative description.
  * This function is also exposed as `listen()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_listen(int sock, int backlog);
 
@@ -465,7 +465,7 @@ __syscall int zsock_listen(int sock, int backlog);
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/accept.html
  * for normative description.
  * This function is also exposed as `accept()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen);
 
@@ -477,7 +477,7 @@ __syscall int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen);
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendto.html
  * for normative description.
  * This function is also exposed as `sendto()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall ssize_t zsock_sendto(int sock, const void *buf, size_t len,
 			       int flags, const struct sockaddr *dest_addr,
@@ -491,7 +491,7 @@ __syscall ssize_t zsock_sendto(int sock, const void *buf, size_t len,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/send.html
  * for normative description.
  * This function is also exposed as `send()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 static inline ssize_t zsock_send(int sock, const void *buf, size_t len,
 				 int flags)
@@ -507,7 +507,7 @@ static inline ssize_t zsock_send(int sock, const void *buf, size_t len,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/sendmsg.html
  * for normative description.
  * This function is also exposed as `sendmsg()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall ssize_t zsock_sendmsg(int sock, const struct msghdr *msg,
 				int flags);
@@ -520,7 +520,7 @@ __syscall ssize_t zsock_sendmsg(int sock, const struct msghdr *msg,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvfrom.html
  * for normative description.
  * This function is also exposed as `recvfrom()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len,
 				 int flags, struct sockaddr *src_addr,
@@ -534,7 +534,7 @@ __syscall ssize_t zsock_recvfrom(int sock, void *buf, size_t max_len,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html
  * for normative description.
  * This function is also exposed as `recvmsg()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall ssize_t zsock_recvmsg(int sock, struct msghdr *msg, int flags);
 
@@ -546,7 +546,7 @@ __syscall ssize_t zsock_recvmsg(int sock, struct msghdr *msg, int flags);
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/recv.html
  * for normative description.
  * This function is also exposed as `recv()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 static inline ssize_t zsock_recv(int sock, void *buf, size_t max_len,
 				 int flags)
@@ -561,7 +561,7 @@ static inline ssize_t zsock_recv(int sock, void *buf, size_t max_len,
  * This functions allow to (only) configure a socket for blocking or
  * non-blocking operation (O_NONBLOCK).
  * This function is also exposed as `fcntl()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined (in which case
  * it may conflict with generic POSIX `fcntl()` function).
  */
 __syscall int zsock_fcntl_impl(int sock, int cmd, int flags);
@@ -599,7 +599,7 @@ static inline int zsock_fcntl_wrapper(int sock, int cmd, ...)
  * `ZFD_IOCTL_FIONREAD`, to set non-blocking mode, and query the number of
  * bytes available to read, respectively.
  * This function is also exposed as `ioctl()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined (in which case
  * it may conflict with generic POSIX `ioctl()` function).
  */
 __syscall int zsock_ioctl_impl(int sock, unsigned long request, va_list ap);
@@ -630,7 +630,7 @@ static inline int zsock_ioctl_wrapper(int sock, unsigned long request, ...)
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/poll.html
  * for normative description.
  * This function is also exposed as `poll()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined (in which case
  * it may conflict with generic POSIX `poll()` function).
  */
 static inline int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout)
@@ -649,7 +649,7 @@ static inline int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout)
  * available in Linux (some options are dummy and provided to ease porting
  * of existing code).
  * This function is also exposed as `getsockopt()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_getsockopt(int sock, int level, int optname,
 			       void *optval, socklen_t *optlen);
@@ -665,7 +665,7 @@ __syscall int zsock_getsockopt(int sock, int level, int optname,
  * available in Linux (some options are dummy and provided to ease porting
  * of existing code).
  * This function is also exposed as `setsockopt()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_setsockopt(int sock, int level, int optname,
 			       const void *optval, socklen_t optlen);
@@ -678,7 +678,7 @@ __syscall int zsock_setsockopt(int sock, int level, int optname,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getpeername.html
  * for normative description.
  * This function is also exposed as `getpeername()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_getpeername(int sock, struct sockaddr *addr,
 				socklen_t *addrlen);
@@ -691,7 +691,7 @@ __syscall int zsock_getpeername(int sock, struct sockaddr *addr,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getsockname.html
  * for normative description.
  * This function is also exposed as `getsockname()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_getsockname(int sock, struct sockaddr *addr,
 				socklen_t *addrlen);
@@ -704,7 +704,7 @@ __syscall int zsock_getsockname(int sock, struct sockaddr *addr,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/gethostname.html
  * for normative description.
  * This function is also exposed as `gethostname()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_gethostname(char *buf, size_t len);
 
@@ -716,7 +716,7 @@ __syscall int zsock_gethostname(char *buf, size_t len);
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_ntop.html
  * for normative description.
  * This function is also exposed as `inet_ntop()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 static inline char *zsock_inet_ntop(sa_family_t family, const void *src,
 				    char *dst, size_t size)
@@ -732,7 +732,7 @@ static inline char *zsock_inet_ntop(sa_family_t family, const void *src,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/inet_pton.html
  * for normative description.
  * This function is also exposed as `inet_pton()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 __syscall int zsock_inet_pton(sa_family_t family, const char *src, void *dst);
 
@@ -775,7 +775,7 @@ __syscall int z_zsock_getaddrinfo_internal(const char *host,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getaddrinfo.html
  * for normative description.
  * This function is also exposed as `getaddrinfo()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 int zsock_getaddrinfo(const char *host, const char *service,
 		      const struct zsock_addrinfo *hints,
@@ -789,7 +789,7 @@ int zsock_getaddrinfo(const char *host, const char *service,
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/freeaddrinfo.html
  * for normative description.
  * This function is also exposed as `freeaddrinfo()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 void zsock_freeaddrinfo(struct zsock_addrinfo *ai);
 
@@ -801,7 +801,7 @@ void zsock_freeaddrinfo(struct zsock_addrinfo *ai);
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/gai_strerror.html
  * for normative description.
  * This function is also exposed as `gai_strerror()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 const char *zsock_gai_strerror(int errcode);
 
@@ -836,7 +836,7 @@ const char *zsock_gai_strerror(int errcode);
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/getnameinfo.html
  * for normative description.
  * This function is also exposed as `getnameinfo()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_NETWORKING} is defined.
  */
 int zsock_getnameinfo(const struct sockaddr *addr, socklen_t addrlen,
 		      char *host, socklen_t hostlen,
@@ -1278,7 +1278,7 @@ struct socket_op_vtable {
  * Additionally, if non-zephyr-prefixed headers are used here,
  * native_sim pulls in those from the host rather than Zephyr's.
  */
-#if defined(CONFIG_POSIX_API)
+#if defined(CONFIG_POSIX_NETWORKING)
 #if !defined(ZEPHYR_INCLUDE_POSIX_ARPA_INET_H_)
 #include <arpa/inet.h>
 #endif
@@ -1294,6 +1294,6 @@ struct socket_op_vtable {
 #if !defined(ZEPHYR_INCLUDE_POSIX_SYS_SOCKET_H_)
 #include <sys/socket.h>
 #endif
-#endif /* CONFIG_POSIX_API */
+#endif /* CONFIG_POSIX_NETWORKING */
 
 #endif /* ZEPHYR_INCLUDE_NET_SOCKET_H_ */

include/zephyr/net/socket_select.h

@@ -43,7 +43,7 @@ typedef struct zvfs_fd_set zsock_fd_set;
  * use zsock_poll() instead. In Zephyr this function works only with
  * sockets, not arbitrary file descriptors.
  * This function is also exposed as `select()`
- * if @kconfig{CONFIG_POSIX_API} is defined (in which case
+ * if @kconfig{CONFIG_POSIX_DEVICE_IO} is defined (in which case
  * it may conflict with generic POSIX `select()` function).
  */
 static inline int zsock_select(int nfds, zsock_fd_set *readfds, zsock_fd_set *writefds,
@@ -68,7 +68,7 @@ static inline int zsock_select(int nfds, zsock_fd_set *readfds, zsock_fd_set *wr
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
  * for normative description.
  * This function is also exposed as `FD_ZERO()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_DEVICE_IO} is defined.
  */
 static inline void ZSOCK_FD_ZERO(zsock_fd_set *set)
 {
@@ -83,7 +83,7 @@ static inline void ZSOCK_FD_ZERO(zsock_fd_set *set)
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
  * for normative description.
  * This function is also exposed as `FD_ISSET()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_DEVICE_IO} is defined.
  */
 static inline int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set)
 {
@@ -98,7 +98,7 @@ static inline int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set)
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
  * for normative description.
  * This function is also exposed as `FD_CLR()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_DEVICE_IO} is defined.
  */
 static inline void ZSOCK_FD_CLR(int fd, zsock_fd_set *set)
 {
@@ -113,7 +113,7 @@ static inline void ZSOCK_FD_CLR(int fd, zsock_fd_set *set)
  * http://pubs.opengroup.org/onlinepubs/9699919799/functions/select.html
  * for normative description.
  * This function is also exposed as `FD_SET()`
- * if @kconfig{CONFIG_POSIX_API} is defined.
+ * if @kconfig{CONFIG_POSIX_DEVICE_IO} is defined.
  */
 static inline void ZSOCK_FD_SET(int fd, zsock_fd_set *set)
 {

include/zephyr/posix/unistd.h

@@ -10,9 +10,7 @@
 #include <sys/types.h>
 #include <time.h>
 
-#ifdef CONFIG_POSIX_API
 #include <zephyr/fs/fs.h>
-#endif
 #include <zephyr/posix/sys/confstr.h>
 #include <zephyr/posix/sys/sysconf.h>
 
@@ -22,7 +20,6 @@
 extern "C" {
 #endif
 
-#ifdef CONFIG_POSIX_API
 /* File related operations */
 int close(int file);
 ssize_t write(int file, const void *buffer, size_t count);
@@ -46,8 +43,6 @@ FUNC_NORETURN void _exit(int status);
 
 int gethostname(char *buf, size_t len);
 
-#endif /* CONFIG_POSIX_API */
-
 #ifdef CONFIG_POSIX_C_LIB_EXT
 int getopt(int argc, char *const argv[], const char *optstring);
 extern char *optarg;

lib/posix/options/clock.c

@@ -119,10 +119,16 @@ int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
 int clock_getcpuclockid(pid_t pid, clockid_t *clock_id)
 {
 	/* We don't allow any process ID but our own.  */
-	if (pid != 0 && pid != getpid()) {
+	if (pid != 0) {
 		return EPERM;
 	}
 
+#ifdef CONFIG_POSIX_MULTI_PROCESS
+	if (pid != getpid()) {
+		return EPERM;
+	}
+#endif
+
 	*clock_id = CLOCK_PROCESS_CPUTIME_ID;
 
 	return 0;

samples/drivers/modem/hello_hl78xx/prj.conf

@@ -9,7 +9,7 @@
 CONFIG_HEAP_MEM_POOL_SIZE=4096
 CONFIG_MAIN_STACK_SIZE=4096
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-CONFIG_POSIX_API=y
+CONFIG_POSIX_AEP_CHOICE_PSE53=y
 
 #PM
 # CONFIG_PM_DEVICE=y

samples/drivers/video/tcpserversink/prj.conf

@@ -3,7 +3,7 @@ CONFIG_NETWORKING=y
 CONFIG_NET_TCP=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_SOCKETS=y
-CONFIG_POSIX_API=y
+CONFIG_POSIX_AEP_CHOICE_PSE53=y
 
 # Kernel options
 CONFIG_MAIN_STACK_SIZE=2048

samples/modules/thrift/hello/client/prj.conf

@@ -4,7 +4,7 @@ CONFIG_REQUIRES_FULL_LIBCPP=y
 CONFIG_CPP=y
 CONFIG_STD_CPP17=y
 CONFIG_CPP_EXCEPTIONS=y
-CONFIG_POSIX_API=y
+CONFIG_POSIX_AEP_CHOICE_PSE53=y
 CONFIG_COMMON_LIBC_THRD=y
 CONFIG_DYNAMIC_THREAD=y
 CONFIG_THREAD_STACK_INFO=y
@@ -14,6 +14,8 @@ CONFIG_NET_SOCKETPAIR=y
 CONFIG_HEAP_MEM_POOL_SIZE=16384
 CONFIG_EVENTFD=y
 CONFIG_XSI_STREAMS=y
+CONFIG_XSI=y
+CONFIG_XSI_SINGLE_PROCESS=y
 
 CONFIG_THRIFT=y