Skip to content

Another shot for comparison #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
casaroli wants to merge 2 commits into
base: staging
Choose a base branch
from
Draft

Another shot for comparison #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5036ce7
move posix stat converter to own file
casaroli Nov 14, 2025
438fad9
WIP zephyr_file posix fixes
casaroli Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions core/shared/platform/common/posix/posix_convert_stat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#include "platform_api_extension.h"

// Converts a POSIX timespec to a WASI timestamp.
__wasi_timestamp_t
static posix_convert_timespec(const struct timespec *ts)
{
if (ts->tv_sec < 0)
return 0;
if ((__wasi_timestamp_t)ts->tv_sec >= UINT64_MAX / 1000000000)
return UINT64_MAX;
return (__wasi_timestamp_t)ts->tv_sec * 1000000000
+ (__wasi_timestamp_t)ts->tv_nsec;
}

// Converts a POSIX stat structure to a WASI filestat structure
void
posix_convert_stat(os_file_handle handle, const struct stat *in,
__wasi_filestat_t *out)
{
out->st_dev = in->st_dev;
out->st_ino = in->st_ino;
out->st_nlink = (__wasi_linkcount_t)in->st_nlink;
out->st_size = (__wasi_filesize_t)in->st_size;
#ifdef __APPLE__
out->st_atim = posix_convert_timespec(&in->st_atimespec);
out->st_mtim = posix_convert_timespec(&in->st_mtimespec);
out->st_ctim = posix_convert_timespec(&in->st_ctimespec);
#else
out->st_atim = posix_convert_timespec(&in->st_atim);
out->st_mtim = posix_convert_timespec(&in->st_mtim);
out->st_ctim = posix_convert_timespec(&in->st_ctim);
#endif

// Convert the file type. In the case of sockets there is no way we
// can easily determine the exact socket type.
if (S_ISBLK(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_BLOCK_DEVICE;
}
else if (S_ISCHR(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_CHARACTER_DEVICE;
}
else if (S_ISDIR(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_DIRECTORY;
}
else if (S_ISFIFO(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_SOCKET_STREAM;
}
else if (S_ISLNK(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_SYMBOLIC_LINK;
}
else if (S_ISREG(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_REGULAR_FILE;
}
else if (S_ISSOCK(in->st_mode)) {
int socktype;
socklen_t socktypelen = sizeof(socktype);

if (getsockopt(handle, SOL_SOCKET, SO_TYPE, &socktype, &socktypelen)
< 0) {
out->st_filetype = __WASI_FILETYPE_UNKNOWN;
return;
}

switch (socktype) {
case SOCK_DGRAM:
out->st_filetype = __WASI_FILETYPE_SOCKET_DGRAM;
break;
case SOCK_STREAM:
out->st_filetype = __WASI_FILETYPE_SOCKET_STREAM;
break;
default:
out->st_filetype = __WASI_FILETYPE_UNKNOWN;
return;
}
}
else {
out->st_filetype = __WASI_FILETYPE_UNKNOWN;
}
}
6 changes: 6 additions & 0 deletions core/shared/platform/common/posix/posix_convert_stat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include "platform_api_extension.h"

// Converts a POSIX stat structure to a WASI filestat structure
void
posix_convert_stat(os_file_handle handle, const struct stat *in,
__wasi_filestat_t *out);
83 changes: 3 additions & 80 deletions core/shared/platform/common/posix/posix_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "platform_api_extension.h"
#include "libc_errno.h"
#include <unistd.h>
#include "posix_util_convert.h"

#if !defined(__APPLE__) && !defined(ESP_PLATFORM)
#define CONFIG_HAS_PWRITEV 1
Expand Down Expand Up @@ -66,84 +67,6 @@
#define STDERR_FILENO 2
#endif

// Converts a POSIX timespec to a WASI timestamp.
static __wasi_timestamp_t
convert_timespec(const struct timespec *ts)
{
if (ts->tv_sec < 0)
return 0;
if ((__wasi_timestamp_t)ts->tv_sec >= UINT64_MAX / 1000000000)
return UINT64_MAX;
return (__wasi_timestamp_t)ts->tv_sec * 1000000000
+ (__wasi_timestamp_t)ts->tv_nsec;
}

// Converts a POSIX stat structure to a WASI filestat structure
static void
convert_stat(os_file_handle handle, const struct stat *in,
__wasi_filestat_t *out)
{
out->st_dev = in->st_dev;
out->st_ino = in->st_ino;
out->st_nlink = (__wasi_linkcount_t)in->st_nlink;
out->st_size = (__wasi_filesize_t)in->st_size;
#ifdef __APPLE__
out->st_atim = convert_timespec(&in->st_atimespec);
out->st_mtim = convert_timespec(&in->st_mtimespec);
out->st_ctim = convert_timespec(&in->st_ctimespec);
#else
out->st_atim = convert_timespec(&in->st_atim);
out->st_mtim = convert_timespec(&in->st_mtim);
out->st_ctim = convert_timespec(&in->st_ctim);
#endif

// Convert the file type. In the case of sockets there is no way we
// can easily determine the exact socket type.
if (S_ISBLK(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_BLOCK_DEVICE;
}
else if (S_ISCHR(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_CHARACTER_DEVICE;
}
else if (S_ISDIR(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_DIRECTORY;
}
else if (S_ISFIFO(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_SOCKET_STREAM;
}
else if (S_ISLNK(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_SYMBOLIC_LINK;
}
else if (S_ISREG(in->st_mode)) {
out->st_filetype = __WASI_FILETYPE_REGULAR_FILE;
}
else if (S_ISSOCK(in->st_mode)) {
int socktype;
socklen_t socktypelen = sizeof(socktype);

if (getsockopt(handle, SOL_SOCKET, SO_TYPE, &socktype, &socktypelen)
< 0) {
out->st_filetype = __WASI_FILETYPE_UNKNOWN;
return;
}

switch (socktype) {
case SOCK_DGRAM:
out->st_filetype = __WASI_FILETYPE_SOCKET_DGRAM;
break;
case SOCK_STREAM:
out->st_filetype = __WASI_FILETYPE_SOCKET_STREAM;
break;
default:
out->st_filetype = __WASI_FILETYPE_UNKNOWN;
return;
}
}
else {
out->st_filetype = __WASI_FILETYPE_UNKNOWN;
}
}

static void
convert_timestamp(__wasi_timestamp_t in, struct timespec *out)
{
Expand Down Expand Up @@ -196,7 +119,7 @@ os_fstat(os_file_handle handle, struct __wasi_filestat_t *buf)
if (ret < 0)
return convert_errno(errno);

convert_stat(handle, &stat_buf, buf);
posix_convert_stat(handle, &stat_buf, buf);

return __WASI_ESUCCESS;
}
Expand All @@ -214,7 +137,7 @@ os_fstatat(os_file_handle handle, const char *path,
if (ret < 0)
return convert_errno(errno);

convert_stat(handle, &stat_buf, buf);
posix_convert_stat(handle, &stat_buf, buf);

return __WASI_ESUCCESS;
}
Expand Down
5 changes: 5 additions & 0 deletions core/shared/platform/zephyr/platform_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
#include <zephyr/net/socket.h>
#endif /* end of KERNEL_VERSION_NUMBER < 0x030200 */

// #include <zephyr/fs/fs_interface.h>

#ifdef CONFIG_USERSPACE
#include <zephyr/sys/mutex.h>
#include <zephyr/sys/sem.h>
Expand Down Expand Up @@ -262,6 +264,7 @@ typedef struct zephyr_fs_desc {
typedef struct zephyr_handle {
int fd;
bool is_sock;
bool is_posix_fd;
} zephyr_handle;

typedef struct zephyr_handle *os_file_handle;
Expand Down Expand Up @@ -290,7 +293,9 @@ typedef struct timespec os_timespec;
#define CLOCK_REALTIME 1
#endif

#ifndef CLOCK_MONOTONIC
#define CLOCK_MONOTONIC 4
#endif

static inline int
os_sched_yield(void)
Expand Down
10 changes: 8 additions & 2 deletions core/shared/platform/zephyr/shared_platform.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,19 @@ if(${CONFIG_MINIMAL_LIBC})
set (source_all ${source_all} ${PLATFORM_COMMON_MATH_SOURCE})
endif()

# list(APPEND source_all ${PLATFORM_SHARED_DIR}/../common/posix/posix_file.c)
list(APPEND source_all ${PLATFORM_SHARED_DIR}/../common/posix/posix_convert_stat.c)

# list(REMOVE_ITEM source_all ${PLATFORM_SHARED_DIR}/zephyr_file.c)


if (NOT WAMR_BUILD_LIBC_WASI EQUAL 1)
list(REMOVE_ITEM source_all ${PLATFORM_SHARED_DIR}/zephyr_socket.c)
list(REMOVE_ITEM source_all ${PLATFORM_SHARED_DIR}/zephyr_file.c)
list(REMOVE_ITEM source_all ${PLATFORM_SHARED_DIR}/zephyr_clock.c)
else()
include (${CMAKE_CURRENT_LIST_DIR}/../common/libc-util/platform_common_libc_util.cmake)
set(source_all ${source_all} ${PLATFORM_COMMON_LIBC_UTIL_SOURCE})
include (${CMAKE_CURRENT_LIST_DIR}/../common/libc-util/platform_common_libc_util.cmake)
set(source_all ${source_all} ${PLATFORM_COMMON_LIBC_UTIL_SOURCE})
endif ()

set (PLATFORM_SHARED_SOURCE ${source_all})
Loading
Loading