gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2024-10-16 13:02:32 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Add more fixes for wasi libc on windows (#2380)

Browse Source 
* disable translations of errno codes that aren't defined on Windows
* undef `min()` macro if it is defined to not conflict with the `min()` function we define
* implement `shed_yield` wasi call
* disable some of the features in the config for windows by default
This commit is contained in:
Marcin Kolny 2023-07-24 08:14:52 +01:00 committed by GitHub
parent a9d008f942
commit fe4ee37122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/posix.c
View File

@ -21,6 +21,18 @@
#include "rights.h"
#include "str.h"
/* Some platforms (e.g. Windows) already define `min()` macro.
We're undefing it here to make sure the `min` call does exactly
what we want it to do. */
#ifdef min
#undef min
#endif
static inline size_t
min(size_t a, size_t b)
{
return a > b ? b : a;
}
#if 0 /* TODO: -std=gnu99 causes compile error, comment them first */
// struct iovec must have the same layout as __wasi_iovec_t.
static_assert(offsetof(struct iovec, iov_base) ==
@ -86,7 +98,9 @@ convert_errno(int error)
X(EDEADLK),
X(EDESTADDRREQ),
X(EDOM),
#ifdef EDQUOT
X(EDQUOT),
#endif
X(EEXIST),
X(EFAULT),
X(EFBIG),
@ -103,7 +117,9 @@ convert_errno(int error)
X(EMFILE),
X(EMLINK),
X(EMSGSIZE),
#ifdef EMULTIHOP
X(EMULTIHOP),
#endif
X(ENAMETOOLONG),
X(ENETDOWN),
X(ENETRESET),
@ -142,7 +158,9 @@ convert_errno(int error)
X(EROFS),
X(ESPIPE),
X(ESRCH),
#ifdef ESTALE
X(ESTALE),
#endif
X(ETIMEDOUT),
X(ETXTBSY),
X(EXDEV),
@ -3591,8 +3609,13 @@ wasmtime_ssp_sock_shutdown(
__wasi_errno_t
wasmtime_ssp_sched_yield(void)
{
#ifdef BH_PLATFORM_WINDOWS
if (!SwitchToThread())
return __WASI_EAGAIN;
#else
if (sched_yield() < 0)
return convert_errno(errno);
#endif
return 0;
}
@ -3756,12 +3779,6 @@ addr_pool_insert(struct addr_pool *addr_pool, const char *addr, uint8 mask)
return true;
}
static inline size_t
min(size_t a, size_t b)
{
return a > b ? b : a;
}
static void
init_address_mask(uint8_t *buf, size_t buflen, size_t mask)
{

9
core/iwasm/libraries/libc-wasi/sandboxed-system-primitives/src/ssp_config.h
View File

@ -47,7 +47,8 @@
#define CONFIG_HAS_CLOCK_NANOSLEEP 0
#endif
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(ESP_PLATFORM)
#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(ESP_PLATFORM) \
&& !defined(_WIN32)
#define CONFIG_HAS_FDATASYNC 1
#else
#define CONFIG_HAS_FDATASYNC 0
@ -65,13 +66,13 @@
#endif
#endif
#if !defined(__APPLE__) && !defined(ESP_PLATFORM)
#if !defined(__APPLE__) && !defined(ESP_PLATFORM) && !defined(_WIN32)
#define CONFIG_HAS_POSIX_FALLOCATE 1
#else
#define CONFIG_HAS_POSIX_FALLOCATE 0
#endif
#if !defined(__APPLE__) && !defined(ESP_PLATFORM)
#if !defined(__APPLE__) && !defined(ESP_PLATFORM) && !defined(_WIN32)
#define CONFIG_HAS_PREADV 1
#else
#define CONFIG_HAS_PREADV 0
@ -89,7 +90,7 @@
#define CONFIG_HAS_PTHREAD_CONDATTR_SETCLOCK 0
#endif
#if !defined(__APPLE__) && !defined(ESP_PLATFORM)
#if !defined(__APPLE__) && !defined(ESP_PLATFORM) && !defined(_WIN32)
#define CONFIG_HAS_PWRITEV 1
#else
#define CONFIG_HAS_PWRITEV 0