Wasip3: File handing implementation

expected/wasm32-wasip3/defined-symbols.txt

@@ -1474,6 +1474,7 @@ wasip3_option_string_free
 wasip3_string_dup
 wasip3_string_dup_n
 wasip3_string_free
+wasip3_string_from_c
 wasip3_string_set
 wasip3_subtask_block_on
 wasip3_subtask_cancel

libc-bottom-half/cloudlibc/src/libc/dirent/dirent_impl.h

@@ -28,7 +28,7 @@ struct _DIR {
   size_t skip;
   size_t offset;
 #elif defined(__wasip3__)
-  filesystem_stream_directory_entry_t stream;
+  filesystem_tuple2_stream_directory_entry_future_result_void_error_code_t stream;
   size_t skip;
   size_t offset;
 #else

libc-bottom-half/cloudlibc/src/libc/dirent/fdclosedir.c

@@ -15,8 +15,10 @@ int fdclosedir(DIR *dirp) {
   if (dirp->stream.__handle != 0)
     filesystem_directory_entry_stream_drop_own(dirp->stream);
 #elif defined(__wasip3__)
-  if (dirp->stream != 0)
-    filesystem_stream_directory_entry_drop_readable(dirp->stream);
+  if (dirp->stream.f0 != 0)
+    filesystem_stream_directory_entry_drop_readable(dirp->stream.f0);
+  if (dirp->stream.f1 != 0)
+    filesystem_future_result_void_error_code_drop_readable(dirp->stream.f1);
 #else
 # error "Unsupported WASI version"
 #endif

libc-bottom-half/cloudlibc/src/libc/dirent/fdopendir.c

@@ -13,6 +13,10 @@
 #else
 #endif
 
+#ifdef __wasip3__
+#include <wasi/wasip3_block.h>
+#endif
+
 #include "dirent_impl.h"
 
 DIR *fdopendir(int fd) {
@@ -49,7 +53,7 @@ DIR *fdopendir(int fd) {
   dirp->dirent = NULL;
   dirp->dirent_size = 1;
   return dirp;
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__)
   // Translate the file descriptor to an internal handle
   filesystem_borrow_descriptor_t file_handle;
   if (fd_to_file_handle(fd, &file_handle) < 0) {
@@ -58,6 +62,7 @@ DIR *fdopendir(int fd) {
   }
 
   // Read the directory
+#ifdef __wasip2__
   filesystem_own_directory_entry_stream_t result;
   filesystem_error_code_t error_code;
   bool ok = filesystem_method_descriptor_read_directory(file_handle,
@@ -69,18 +74,17 @@ DIR *fdopendir(int fd) {
     return NULL;
   }
 
-  dirp->fd = fd;
   dirp->stream = result;
+#elif defined(__wasip3__)
+  wasip3_subtask_status_t status = filesystem_method_descriptor_read_directory(file_handle, &dirp->stream);
+  wasip3_subtask_block_on(status);
+#endif
+  dirp->fd = fd;
   dirp->skip = 0;
   dirp->offset = 0;
   dirp->dirent = NULL;
   dirp->dirent_size = 1;
   return dirp;
-#elif defined(__wasip3__)
-  // TODO(wasip3)
-  errno = ENOTSUP;
-  free(dirp);
-  return NULL;
 #else
 # error "Unsupported WASI version"
 #endif

libc-bottom-half/cloudlibc/src/libc/dirent/readdir.c

@@ -31,6 +31,10 @@ static_assert(DT_REG == __WASI_FILETYPE_REGULAR_FILE, "Value mismatch");
 static_assert(DT_UNKNOWN == __WASI_FILETYPE_UNKNOWN, "Value mismatch");
 #endif
 
+#ifdef __wasip3__
+#include <wasi/wasip3_block.h>
+#endif
+
 // Grows a buffer to be large enough to hold a certain amount of data.
 #define GROW(buffer, buffer_size, target_size)      \
   do {                                              \
@@ -140,12 +144,13 @@ struct dirent *readdir(DIR *dirp) {
   }
 }
 
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__)
 
 static int ensure_has_directory_stream(DIR *dirp, filesystem_borrow_descriptor_t *handle) {
   if (fd_to_file_handle(dirp->fd, handle) < 0)
     return -1;
 
+#ifdef __wasip2__
   if (dirp->stream.__handle != 0)
     return 0;
 
@@ -157,6 +162,12 @@ static int ensure_has_directory_stream(DIR *dirp, filesystem_borrow_descriptor_t
     translate_error(error_code);
     return -1;
   }
+#elif defined(__wasip3__)
+  if (dirp->stream.f0 == 0) {
+    wasip3_subtask_status_t status = filesystem_method_descriptor_read_directory(*handle, &dirp->stream);
+    wasip3_subtask_block_on(status);
+  }
+#endif
   return 0;
 }
 
@@ -173,13 +184,24 @@ static struct dirent *readdir_next(DIR *dirp) {
   if (dirp->offset == 0) {
     dirp->offset += 1;
     GROW(dirp->dirent, dirp->dirent_size, offsetof(struct dirent, d_name) + 2);
+#ifdef __wasip2__
     bool ok = filesystem_method_descriptor_metadata_hash(dir_handle,
                                                          &metadata,
                                                          &error_code);
     if (!ok) {
       translate_error(error_code);
       return NULL;
     }
+#else
+    filesystem_result_metadata_hash_value_error_code_t result;
+    wasip3_subtask_status_t status = filesystem_method_descriptor_metadata_hash(dir_handle, &result);
+    wasip3_subtask_block_on(status);
+    if (result.is_err) {
+      translate_error(result.val.err);
+      return NULL;
+    }
+    metadata = result.val.ok;
+#endif
     dirp->dirent->d_ino = metadata.lower;
     dirp->dirent->d_type = DT_DIR;
     dirp->dirent->d_name[0] = '.';
@@ -200,6 +222,7 @@ static struct dirent *readdir_next(DIR *dirp) {
     return dirp->dirent;
   }
 
+#ifdef __wasip2__
   filesystem_borrow_directory_entry_stream_t stream = filesystem_borrow_directory_entry_stream(dirp->stream);
   filesystem_option_directory_entry_t dir_entry_optional;
   bool ok = filesystem_method_directory_entry_stream_read_directory_entry(stream,
@@ -216,6 +239,14 @@ static struct dirent *readdir_next(DIR *dirp) {
 
   filesystem_directory_entry_t dir_entry = dir_entry_optional.val;
 
+#elif defined(__wasip3__)
+  filesystem_directory_entry_t dir_entry;
+  wasip3_waitable_status_t status = filesystem_stream_directory_entry_read(dirp->stream.f0, &dir_entry, 1);
+  ssize_t amount = wasip3_waitable_block_on(status, dirp->stream.f0);
+  if (amount<1)
+    return NULL;
+#endif
+
   // Ensure that the dirent is large enough to fit the filename
   size_t the_size = offsetof(struct dirent, d_name);
   GROW(dirp->dirent, dirp->dirent_size, the_size + dir_entry.name.len + 1);
@@ -227,6 +258,7 @@ static struct dirent *readdir_next(DIR *dirp) {
 
   // Fill out `d_ino` with the metadata hash.
   filesystem_path_flags_t path_flags = 0; // Don't follow symlinks
+#ifdef __wasip2__
   ok = filesystem_method_descriptor_metadata_hash_at(dir_handle,
                                                      path_flags,
                                                      &dir_entry.name,
@@ -237,6 +269,17 @@ static struct dirent *readdir_next(DIR *dirp) {
     translate_error(error_code);
     return NULL;
   }
+#else
+  filesystem_result_metadata_hash_value_error_code_t result;
+  status = filesystem_method_descriptor_metadata_hash_at(dir_handle, path_flags, dir_entry.name, &result);
+  wasip3_subtask_block_on(status);
+  //wasip3_string_free(&dir_entry.name);
+  if (result.is_err) {
+    translate_error(result.val.err);
+    return NULL;
+  }
+  metadata = result.val.ok;
+#endif
   dirp->dirent->d_ino = metadata.lower;
   dirp->offset += 1;
 
@@ -251,13 +294,6 @@ struct dirent *readdir(DIR *dirp) {
   }
   return result;
 }
-#elif defined(__wasip3__)
-struct dirent *readdir(DIR *dirp) {
-  // TODO(wasip3)
-  errno = ENOTSUP;
-  free(dirp);
-  return NULL;
-}
 #else
 # error "Unknown WASI version"
 #endif

libc-bottom-half/cloudlibc/src/libc/dirent/rewinddir.c

@@ -18,7 +18,14 @@ void rewinddir(DIR *dirp) {
   dirp->skip = 0;
   dirp->offset = 0;
 #elif defined(__wasip3__)
-  dirp->stream = 0;
+  if (dirp->stream.f0 != 0) {
+    filesystem_stream_directory_entry_drop_readable(dirp->stream.f0);
+    dirp->stream.f0 = 0;
+  }
+  if (dirp->stream.f1 != 0) {
+    filesystem_future_result_void_error_code_drop_readable(dirp->stream.f1);
+    dirp->stream.f1 = 0;
+  }
   dirp->skip = 0;
   dirp->offset = 0;
 #else

libc-bottom-half/cloudlibc/src/libc/dirent/seekdir.c

@@ -18,7 +18,14 @@ void seekdir(DIR *dirp, long loc) {
   dirp->skip = loc;
   dirp->offset = 0;
 #elif defined(__wasip3__)
-  dirp->stream = 0;
+  if (dirp->stream.f0 != 0) {
+    filesystem_stream_directory_entry_drop_readable(dirp->stream.f0);
+    dirp->stream.f0 = 0;
+  }
+  if (dirp->stream.f1 != 0) {
+    filesystem_future_result_void_error_code_drop_readable(dirp->stream.f1);
+    dirp->stream.f1 = 0;
+  }
   dirp->skip = loc;
   dirp->offset = 0;
 #else

libc-bottom-half/cloudlibc/src/libc/fcntl/openat.c

@@ -16,6 +16,10 @@
 #include <common/errors.h>
 #endif
 
+#ifdef __wasip3__
+#include <wasi/wasip3_block.h>
+#endif
+
 #ifdef __wasip1__
 static_assert(O_APPEND == __WASI_FDFLAGS_APPEND, "Value mismatch");
 static_assert(O_DSYNC == __WASI_FDFLAGS_DSYNC, "Value mismatch");
@@ -87,7 +91,7 @@ int __wasilibc_nocwd_openat_nomode(int fd, const char *path, int oflag) {
     return -1;
   }
   return newfd;
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__)
   // Set up path flags
   filesystem_path_flags_t lookup_flags = 0;
   if ((oflag & O_NOFOLLOW) == 0)
@@ -140,6 +144,7 @@ int __wasilibc_nocwd_openat_nomode(int fd, const char *path, int oflag) {
     return -1;
 
   // Construct a WASI string for the path
+#ifdef __wasip2__
   wasip2_string_t path2;
   if (wasip2_string_from_c(path, &path2) < 0)
     return -1;
@@ -162,9 +167,28 @@ int __wasilibc_nocwd_openat_nomode(int fd, const char *path, int oflag) {
   // Update the descriptor table with the new handle
   return __wasilibc_add_file(new_handle, oflag);
 #elif defined(__wasip3__)
-  // TODO(wasip3)
-  errno = ENOTSUP;
-  return -1;
+  wasip3_string_t path3;
+  if (wasip3_string_from_c(path, &path3) < 0)
+    return -1;
+
+  // Open the file, yielding a new handle
+  filesystem_method_descriptor_open_at_args_t args;
+  args.self = file_handle;
+  args.flags = lookup_flags;
+  args.path = path3;
+  args.open_flags = open_flags;
+  args.path_flags = fs_flags;
+  filesystem_result_own_descriptor_error_code_t result;
+  wasip3_subtask_status_t status = filesystem_method_descriptor_open_at(&args, &result);
+  wasip3_subtask_block_on(status);
+  if (result.is_err) {
+    translate_error(result.val.err);
+    return -1;
+  }
+
+  // Update the descriptor table with the new handle
+  return __wasilibc_add_file(result.val.ok, oflag);
+#endif
 #else
 # error "Unsupported WASI version"
 #endif

libc-bottom-half/cloudlibc/src/libc/unistd/lseek.c

@@ -29,7 +29,7 @@ off_t __lseek(int fildes, off_t offset, int whence) {
     return -1;
   }
   return new_offset;
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__)
   // Look up a stream for fildes
   descriptor_table_entry_t *entry = descriptor_table_get_ref(fildes);
   if (!entry)
@@ -39,10 +39,6 @@ off_t __lseek(int fildes, off_t offset, int whence) {
     return -1;
   }
   return entry->vtable->seek(entry->data, offset, whence);
-#elif defined(__wasip3__)
-  // TODO(wasip3)
-  errno = ENOTSUP;
-  return -1;
 #else
 # error "Unknown WASI version"
 #endif

libc-bottom-half/headers/private/wasi/file_utils.h

@@ -49,6 +49,9 @@ static int wasip2_handle_write_error(streams_stream_error_t error) {
 // Returns -1 and sets errno to `ENOENT` if `s` is not valid utf-8.
 int wasip2_string_from_c(const char *s, wasip2_string_t* out);
 #endif
+#ifdef __wasip3__
+int wasip3_string_from_c(const char *s, wasip3_string_t* out);
+#endif
 
 #if defined(__wasip2__) || defined(__wasip3__)
 // Succeed only if fd is bound to a file handle in the descriptor table

libc-bottom-half/sources/__wasilibc_tell.c

@@ -19,7 +19,7 @@ off_t __wasilibc_tell(int fildes) {
     return -1;
   }
   return offset;
-#elif defined(__wasip2__)
+#elif defined(__wasip2__) || defined(__wasip3__)
   // Look up a stream for fildes
   descriptor_table_entry_t *entry = descriptor_table_get_ref(fildes);
   if (!entry)
@@ -29,10 +29,6 @@ off_t __wasilibc_tell(int fildes) {
     return -1;
   }
   return entry->vtable->seek(entry->data, 0, SEEK_CUR);
-#elif defined(__wasip3__)
-  // TODO(wasip3)
-  errno = ENOTSUP;
-  return -1;
 #else
 #error "Unsupported WASI version"
 #endif