posix: implement parts of posix device io not in iso c

Implement the components of the POSIX_DEVICE_IO Option Group
that are not already implemented by any C89-conformant C library.

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

Author: cfriedt

include/zephyr/net/socket.h

@@ -625,7 +625,10 @@ static inline int zsock_ioctl_wrapper(int sock, unsigned long request, ...)
  * it may conflict with generic POSIX ``poll()`` function).
  * @endrst
  */
-__syscall int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout);
+static inline int zsock_poll(struct zsock_pollfd *fds, int nfds, int timeout)
+{
+	return zvfs_poll((struct zvfs_pollfd *)fds, nfds, timeout);
+}
 
 /**
  * @brief Get various socket options

include/zephyr/net/socket_select.h

@@ -19,8 +19,11 @@
  * @{
  */
 
+#include <time.h>
+
 #include <zephyr/toolchain.h>
 #include <zephyr/net/socket_types.h>
+#include <zephyr/sys/fdtable.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,10 +50,16 @@ typedef struct zsock_fd_set {
  * it may conflict with generic POSIX ``select()`` function).
  * @endrst
  */
-__syscall int zsock_select(int nfds, zsock_fd_set *readfds,
-			   zsock_fd_set *writefds,
-			   zsock_fd_set *exceptfds,
-			   struct zsock_timeval *timeout);
+static inline int zsock_select(int nfds, zsock_fd_set *readfds, zsock_fd_set *writefds,
+			       zsock_fd_set *exceptfds, struct zsock_timeval *timeout)
+{
+	struct timespec to = {
+		.tv_sec = (timeout == NULL) ? 0 : timeout->tv_sec,
+		.tv_nsec = (long)((timeout == NULL) ? 0 : timeout->tv_usec * NSEC_PER_USEC)};
+
+	return zvfs_select(nfds, (struct zvfs_fd_set *)readfds, (struct zvfs_fd_set *)writefds,
+			   (struct zvfs_fd_set *)exceptfds, (timeout == NULL) ? NULL : &to, NULL);
+}
 
 /** Number of file descriptors which can be added to zsock_fd_set */
 #define ZSOCK_FD_SETSIZE (sizeof(((zsock_fd_set *)0)->bitset) * 8)
@@ -67,7 +76,10 @@ __syscall int zsock_select(int nfds, zsock_fd_set *readfds,
  * if :kconfig:option:`CONFIG_POSIX_API` is defined.
  * @endrst
  */
-void ZSOCK_FD_ZERO(zsock_fd_set *set);
+static inline void ZSOCK_FD_ZERO(zsock_fd_set *set)
+{
+	ZVFS_FD_ZERO((struct zvfs_fd_set *)set);
+}
 
 /**
  * @brief Check whether socket is a member of fd_set
@@ -81,7 +93,10 @@ void ZSOCK_FD_ZERO(zsock_fd_set *set);
  * if :kconfig:option:`CONFIG_POSIX_API` is defined.
  * @endrst
  */
-int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set);
+static inline int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set)
+{
+	return ZVFS_FD_ISSET(fd, (struct zvfs_fd_set *)set);
+}
 
 /**
  * @brief Remove socket from fd_set
@@ -95,7 +110,10 @@ int ZSOCK_FD_ISSET(int fd, zsock_fd_set *set);
  * if :kconfig:option:`CONFIG_POSIX_API` is defined.
  * @endrst
  */
-void ZSOCK_FD_CLR(int fd, zsock_fd_set *set);
+static inline void ZSOCK_FD_CLR(int fd, zsock_fd_set *set)
+{
+	ZVFS_FD_CLR(fd, (struct zvfs_fd_set *)set);
+}
 
 /**
  * @brief Add socket to fd_set
@@ -109,7 +127,10 @@ void ZSOCK_FD_CLR(int fd, zsock_fd_set *set);
  * if :kconfig:option:`CONFIG_POSIX_API` is defined.
  * @endrst
  */
-void ZSOCK_FD_SET(int fd, zsock_fd_set *set);
+static inline void ZSOCK_FD_SET(int fd, zsock_fd_set *set)
+{
+	ZVFS_FD_SET(fd, (struct zvfs_fd_set *)set);
+}
 
 /** @cond INTERNAL_HIDDEN */
 
@@ -153,8 +174,6 @@ static inline void FD_SET(int fd, zsock_fd_set *set)
 }
 #endif
 
-#include <zephyr/syscalls/socket_select.h>
-
 /**
  * @}
  */

include/zephyr/posix/fcntl.h

@@ -8,9 +8,13 @@
 #define ZEPHYR_POSIX_FCNTL_H_
 
 #ifdef CONFIG_PICOLIBC
-#define O_CREAT 0x0040
+#define O_CREAT  0x0040
+#define O_TRUNC  0x0200
+#define O_APPEND 0x0400
 #else
-#define O_CREAT 0x0200
+#define O_APPEND 0x0008
+#define O_CREAT  0x0200
+#define O_TRUNC  0x0400
 #endif
 
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
@@ -19,7 +23,6 @@
 #define O_WRONLY 01
 #define O_RDWR	 02
 
-#define O_APPEND   0x0400
 #define O_EXCL	   0x0800
 #define O_NONBLOCK 0x4000
 

include/zephyr/posix/sys/select.h

@@ -6,23 +6,25 @@
 #ifndef ZEPHYR_INCLUDE_POSIX_SYS_SELECT_H_
 #define ZEPHYR_INCLUDE_POSIX_SYS_SELECT_H_
 
-#include <zephyr/net/socket_types.h>
-#include <zephyr/net/socket_select.h>
+#include <signal.h>
+
+#include <zephyr/posix/sys/time.h>
+#include <zephyr/sys/fdtable.h>
+#include <zephyr/toolchain.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define fd_set zsock_fd_set
-#define FD_SETSIZE ZSOCK_FD_SETSIZE
-#define FD_ZERO ZSOCK_FD_ZERO
-#define FD_SET ZSOCK_FD_SET
-#define FD_CLR ZSOCK_FD_CLR
-#define FD_ISSET ZSOCK_FD_ISSET
-
-struct timeval;
+typedef struct zvfs_fd_set fd_set;
 
-int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
+int pselect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds,
+	    const struct timespec *timeout, const sigset_t *sigmask);
+int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *timeout);
+void FD_CLR(int fd, fd_set *fdset);
+int FD_ISSET(int fd, fd_set *fdset);
+void FD_SET(int fd, fd_set *fdset);
+void FD_ZERO(fd_set *fdset);
 
 #ifdef __cplusplus
 }

include/zephyr/sys/fdtable.h

@@ -8,6 +8,8 @@
 
 #include <stdarg.h>
 #include <sys/types.h>
+#include <time.h>
+
 /* FIXME: For native_posix ssize_t, off_t. */
 #include <zephyr/fs/fs.h>
 #include <zephyr/sys/mutex.h>
@@ -26,6 +28,13 @@
 #define ZVFS_MODE_IFLNK  0120000
 #define ZVFS_MODE_IFSOCK 0140000
 
+#define ZVFS_POLLIN   BIT(0)
+#define ZVFS_POLLPRI  BIT(1)
+#define ZVFS_POLLOUT  BIT(2)
+#define ZVFS_POLLERR  BIT(3)
+#define ZVFS_POLLHUP  BIT(4)
+#define ZVFS_POLLNVAL BIT(5)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -191,6 +200,28 @@ static inline int z_fdtable_call_ioctl(const struct fd_op_vtable *vtable, void *
 	return res;
 }
 
+struct zvfs_pollfd {
+	int fd;
+	short events;
+	short revents;
+};
+
+__syscall int zvfs_poll(struct zvfs_pollfd *fds, int nfds, int poll_timeout);
+
+struct zvfs_fd_set {
+	uint32_t bitset[(CONFIG_ZVFS_OPEN_MAX + 31) / 32];
+};
+
+void ZVFS_FD_CLR(int fd, struct zvfs_fd_set *fdset);
+int ZVFS_FD_ISSET(int fd, struct zvfs_fd_set *fdset);
+void ZVFS_FD_SET(int fd, struct zvfs_fd_set *fdset);
+void ZVFS_FD_ZERO(struct zvfs_fd_set *fdset);
+
+__syscall int zvfs_select(int nfds, struct zvfs_fd_set *ZRESTRICT readfds,
+			  struct zvfs_fd_set *ZRESTRICT writefds,
+			  struct zvfs_fd_set *ZRESTRICT errorfds,
+			  const struct timespec *ZRESTRICT timeout, const void *ZRESTRICT sigmask);
+
 /**
  * Request codes for fd_op_vtable.ioctl().
  *
@@ -220,4 +251,6 @@ enum {
 }
 #endif
 
+#include <zephyr/syscalls/fdtable.h>
+
 #endif /* ZEPHYR_INCLUDE_SYS_FDTABLE_H_ */

lib/os/CMakeLists.txt

@@ -12,6 +12,9 @@ zephyr_sources(
   )
 
 zephyr_sources_ifdef(CONFIG_FDTABLE fdtable.c)
+zephyr_syscall_header_ifdef(CONFIG_FDTABLE
+  ${ZEPHYR_BASE}/include/zephyr/sys/fdtable.h
+)
 
 zephyr_sources_ifdef(CONFIG_CBPRINTF_COMPLETE cbprintf_complete.c)
 zephyr_sources_ifdef(CONFIG_CBPRINTF_NANO cbprintf_nano.c)