Port poll() to use wasip2 poll method in all cases

At this point, there should be no further uses of the preview1
component adapter for polling methods (__wasi_poll_oneoff())
when __wasilibc_use_wasip2 is defined.

Author: catamorphism

libc-bottom-half/cloudlibc/src/libc/poll/poll.c

@@ -140,7 +140,11 @@ int poll(struct pollfd* fds, nfds_t nfds, int timeout)
     for (size_t i = 0; i < nfds; ++i) {
         descriptor_table_entry_t* entry;
         if (descriptor_table_get_ref(fds[i].fd, &entry)) {
-            found_socket = true;
+            if (entry->tag == DESCRIPTOR_TABLE_ENTRY_TCP_SOCKET
+                || entry->tag == DESCRIPTOR_TABLE_ENTRY_UDP_SOCKET)
+                found_socket = true;
+            else
+                found_non_socket = true;
         } else {
             found_non_socket = true;
         }
@@ -155,16 +159,8 @@ int poll(struct pollfd* fds, nfds_t nfds, int timeout)
             errno = ENOTSUP;
             return -1;
         }
-
-        return poll_wasip2(fds, nfds, timeout);
-    } else if (found_non_socket) {
-        return poll_wasip1(fds, nfds, timeout);
-    } else if (timeout >= 0) {
-        return poll_wasip2(fds, nfds, timeout);
-    } else {
-        errno = ENOTSUP;
-        return -1;
     }
+    return poll_wasip2(fds, nfds, timeout);
 }
 #else // not __wasilibc_use_wasip2
 int poll(struct pollfd* fds, nfds_t nfds, int timeout)

libc-bottom-half/sources/poll-wasip2.c

@@ -141,7 +141,42 @@ int poll_wasip2(struct pollfd *fds, size_t nfds, int timeout)
 				}
 				break;
 			}
-
+                        case DESCRIPTOR_TABLE_ENTRY_FILE_STREAM: {
+                            file_stream_t stream = entry->stream;
+                            if ((pollfd->events & POLLRDNORM) != 0) {
+                                if (!stream.file_info.readable) {
+                                    errno = EBADF;
+                                    return -1;
+                                }
+                                streams_own_pollable_t input_stream_pollable =
+                                    streams_method_input_stream_subscribe(stream.read_stream);
+                                states[state_index++] = (state_t) {
+                                    .pollable = input_stream_pollable,
+                                    .pollfd = pollfd,
+                                    .entry = entry,
+                                    .events = pollfd->events
+                                };
+                            }
+                            if ((pollfd->events & POLLWRNORM) != 0) {
+                                if (!stream.file_info.writable) {
+                                    errno = EBADF;
+                                    return -1;
+                                }
+                                streams_own_pollable_t output_stream_pollable =
+                                    streams_method_output_stream_subscribe(stream.write_stream);
+                                states[state_index++] = (state_t){
+                                    .pollable = output_stream_pollable,
+                                    .pollfd = pollfd,
+                                    .entry = entry,
+                                    .events = pollfd->events
+                                };
+                            }
+                            break;
+                        }
+                        // File must be open
+                        case DESCRIPTOR_TABLE_ENTRY_FILE_HANDLE:
+                                errno = EBADF;
+                                return -1;
 			default:
 				errno = ENOTSUP;
 				return -1;
@@ -238,7 +273,14 @@ int poll_wasip2(struct pollfd *fds, size_t nfds, int timeout)
 					}
 					state->pollfd->revents |= state->events;
 				}
-			} else {
+			} else if (state->entry->tag == DESCRIPTOR_TABLE_ENTRY_FILE_STREAM) {
+                                poll_pollable_drop_own(state->pollable);
+				if (state->pollfd->revents == 0) {
+					++event_count;
+				}
+				state->pollfd->revents |= state->events;
+                        }
+                        else {
 				if (state->pollfd->revents == 0) {
 					++event_count;
 				}

test/src/misc/poll.c

@@ -0,0 +1,36 @@
+//! add-flags.py(RUN): --dir fs::/
+
+// Modified from libc-test to not use tmpfile or /dev/null
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <poll.h>
+#include "test.h"
+
+#define TEST(c, ...) ((c) ? 1 : (t_error(#c" failed: " __VA_ARGS__),0))
+
+int main(void)
+{
+        char tmp[] = "testsuite-XXXXXX";
+        int fd;
+        int flags = 0;
+
+        // Not a very useful test, but it's hard to test poll() without threads
+
+        TEST((fd = open(tmp, flags | O_RDWR | O_CREAT | O_EXCL, 0600)) > 2);
+        TEST(write(fd, "hello", 6)==6);
+
+        struct pollfd poll_fd = { .fd =  fd, .events = POLLRDNORM, .revents = 0 };
+        TEST(poll(&poll_fd, 1, 1)==1);
+
+        poll_fd.events = POLLWRNORM;
+        TEST(poll(&poll_fd, 1, 1)==1);
+
+        close(fd);
+
+        if (fd > 2)
+            TEST(unlink(tmp) != -1);
+
+	return t_status;
+}