lucasAbadFr
commented
7 months ago Status
-
Abstracting libc primitives: After looking at how the POSIX primitives where abstracted in
core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/to supportWindows. I think that we could do the same to supportZephyr, with the final idea to have an implementation entirely relying on theos_APIs.- functions:
- poll --> os_poll
- ioctl --> os_ioctl
- structs/types:
- timespec --> os_timespec
- pollfd --> os_poll_file_handle
- nfds_t --> os_nfds_t
- functions:
-
Extending
platform_api_extension.h: The following API were added.__wasi_errno_t os_ioctl(os_file_handle *handle, int request, void *argp); // Not sure for return type __wasi_errno_t os_poll(os_poll_file_handle *pfds, os_nfds_t nfs, int timeout); -
Changing the sandboxed system primitives to use the new types and functions.
random.c:#elif defined(BH_PLATFORM_ZEPHYR) static void open_urandom(void) { // Not implemented } __wasi_errno_t random_buf(void *buf, size_t len) { return __WASI_ENOSYS; }blocking.h:__wasi_errno_t - os_poll(pollfd *pfds, os_nfds_t nfds, int timeout) + os_poll(os_poll_file_handle *pfds, os_nfds_t nfds, int timeout)locking.h: change everystruct timespectostruct os_timespecposix.c: change everystruct pollfdtostruct os_poll_file_handle
-
Defining new types in
platform_internal.h: Based on theos_file_handletype implementation we define the following types (and flags).typedef struct zsock_pollfd os_poll_file_handle; typedef unsigned int os_nfds_t; // To use posix flags #define POLLIN ZSOCK_POLLIN #define POLLPRI ZSOCK_POLLPRI #define POLLOUT ZSOCK_POLLOUT #define POLLERR ZSOCK_POLLERR #define POLLHUP ZSOCK_POLLHUP #define POLLNVAL ZSOCK_POLLNVAL #define FIONREAD ZFD_IOCTL_FIONREAD typedef struct { time_t tv_sec; long tv_nsec; } os_timespec; #define CLOCK_REALTIME 1 #define CLOCK_MONOTONIC 4 typedef struct { struct k_mutex mtx; // Mutex for exclusive access struct k_sem sem; // Semaphore for shared access int read_count; // Number of readers } korp_rwlock; -
Implementing the new functions in
platform_socket.c:__wasi_errno_t os_ioctl(os_file_handle *handle, int request, void *argp) { __wasi_errno_t wasi_errno = __WASI_ESUCCESS; if(zsock_ioctl_wrapper(handle, request, argp) < 0){ wasi_errno = zephyr_to_wasi_errno(errno); } return wasi_errno; } __wasi_errno_t os_poll(os_poll_file_handle *fds, os_nfds_t nfs, int timeout) { __wasi_errno_t wasi_errno = __WASI_ESUCCESS; int rc = 0; rc = zsock_poll(fds, nfs, timeout) if(rc < 0){ wasi_errno = zephyr_to_wasi_errno(errno); } switch(rc){ case 0: wasi_errno = __WASI_ETIMEOUT; break; case -1: wasi_errno = zephyr_to_wasi_errno(errno); break; default: break; } return wasi_errno; } -
compilation errors The compilation still fail with the same warnings as before. The unknown flags errors have disappeared. But the warning about the
struct timespecandstruct pollfdstill persist.- Error on
locking.h:/home/user/wasm-micro-runtime/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/locking.h:200:12: error: variable 'ts' has initializer but incomplete type 200 | struct os_timespec ts = { | ^~~~~~~~~~~ /home/user/wasm-micro-runtime/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/locking.h:201:10: error: 'struct os_timespec' has no member named 'tv_sec' 201 | .tv_sec = (time_t)(timeout / 1000000000), | ^~~~~~ /home/user/wasm-micro-runtime/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/locking.h:201:19: warning: excess elements in struct initializer 201 | .tv_sec = (time_t)(timeout / 1000000000), | ^ /home/user/wasm-micro-runtime/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/locking.h:201:19: note: (near initialization for 'ts') - Error on
posix.c:/home/user/wasm-micro-runtime/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c:2153:61: error: invalid application of 'sizeof' to incomplete type 'struct os_poll_file_handle' 2153 | wasm_runtime_malloc((uint32)(nsubscriptions * sizeof(*pfds))); | ^ /home/user/wasm-micro-runtime/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c:2177:25: error: invalid use of undefined type 'struct os_poll_file_handle' 2177 | pfds[i] = (struct os_poll_file_handle){ | ^ /home/user/wasm-micro-runtime/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c:2178:26: error: 'struct os_poll_file_handle' has no member named 'fd' 2178 | .fd = fos[i]->file_handle, | ^~ /home/user/wasm-micro-runtime/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c:2178:31: warning: excess elements in struct initializer 2178 | .fd = fos[i]->file_handle, |
This look like the compiler is not able to find the definition of the new types.
- I tried to include the
platform_internal.hin thelocking.handposix.cfiles to see if it solves the issue. But it didn't work. - I also tried to directly define the types in a new header and directly include it in the
locking.handposix.cfiles. But the issue still persist. - I even defined the whole file System API in a
zephyr_file.cfile (just returning__WASI_ENOSYSfor now), and changedshared_platform.cmake. But the issue still persist.
I'm still stuck on this issue. I will try to find a solution.
If anyone is familiar with the implemenation of the
sanboxed system primitives, or the how the abstract POSIX APIs are passed tosanboxed system primitives.Any help on this would be appreciated.
- Error on
wenyongh
Hello, I'm currently experimenting with sockets in WAMR on Zephyr, and I'm encountering some challenges.
nucleo-h563ziboard, but I'm facing compilation issues.Compilation issues
Plain compilation
I compilated the
http_clientto a wasm module and like with thesimplesample, I included it in a header file. But when I ran it on the board I had:WAMR_BUILD_LIBC_WASI flag
After looking at the
socket-apisample, I found that I need to use theWAMR_BUILD_LIBC_WASIflag, so I added this flag to theCMakeLists.txtfile but it didn't work.The output of the compilation is the same described in this issue My errors concist mainly of:
libc_errno.hnot found.nfds_tunknown type.pthread_condattr_tunknown type &CLOCK_MONOTONICundeclared.Try to resolve
I browsed the issues and found this Pull Request, but applying the fix lead to more errors and just one error was fixed.
In
core/shared/platform/zephyr/shared_platform.cmakeI added the following lines:The error
libc_errno.hwas fixed but the other errors still persist. I also get all the errors from the/core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.cfile, mostly linked to the File System API ( e.g errors onstruct pollfd).Test on host
I reused the
socket-apisample to compile and run thehttp_clientmodule and it worked on my host machine.Runtime configuration
Am I missing something ?
My runtime configuration is the following:
How to use the address pool ?
I would like to have some help with the
libc_wasi_init(wasm_module, argc, argv, &wasi_parse_ctx)function because if I understood it's mandatory to run a network application on WAMR.I looked at the
product-mini/plateforms/posix/main.c&product-mini/plateforms/common/libc_wasi.cfiles but didn't fully understand the implementation because it is made to parse arguments from the command line.Meanwhile, I'm trying to run the
http_clientmodule on the board, so I don't have the possibility to pass arguments to the module.I came up with this configuration before
wasm_runtime_full_init(&init_args)call inmain.c.But I'm not sure if it's the right way to use the
libc_wasi_parsefunction.Should I change build policy ?
I tried to adapt the
CMakeLists.txtfile from thesimplesample. What I changed:WAMR_BUILD_LIBC_WASIflag.wamr-sdkas an external projecxt and compile thelibapp_framework.a.http_clientmodule.I added a custom command that use a python script to generate the
http_client.hmodule.Any help will be appreciated. Thanks.