Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion core/iwasm/common/wasm_application.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ wasm_application_execute_main(WASMModuleInstanceCommon *module_inst, int32 argc,
exec_env = wasm_runtime_get_exec_env_singleton(module_inst);
if (exec_env) {
wasm_runtime_dump_mem_consumption(exec_env);
(WASMModuleInstance *)module_inst->cur_exception
}
#endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2210,9 +2210,16 @@ wasmtime_ssp_poll_oneoff(wasm_exec_env_t exec_env, struct fd_table *curfds,
fd_object_get_locked(&fos[i], ft, s->u.u.fd_readwrite.fd,
__WASI_RIGHT_POLL_FD_READWRITE, 0);
if (error == 0) {

// Temporary workaround (see PR#4377)
#ifdef BH_PLATFORM_ZEPHYR
os_file_handle tfd = fos[i]->file_handle->fd;
#else
os_file_handle tfd = fos[i]->file_handle;
#endif
// Proper file descriptor on which we can poll().
pfds[i] = (os_poll_file_handle){
.fd = fos[i]->file_handle->fd,
.fd = tfd,
.events = s->u.type == __WASI_EVENTTYPE_FD_READ
? POLLIN
: POLLOUT,
Expand Down Expand Up @@ -2854,13 +2861,10 @@ wasmtime_ssp_sock_recv_from(wasm_exec_env_t exec_env, struct fd_table *curfds,
}

// If the source address is not NULL, the caller is requesting the source
// address to be returned if the protocol supports it. As such, we convert
// the format of the structure pass in prior to the call to the OS
// implementation. If the value is NULL, the POSIX standard states that
// the address is not returned.
// address to be returned if the protocol supports it. If the value is
// NULL, the POSIX standard states that the address is not returned.
if (src_addr != NULL) {
sockaddr_ptr = &sockaddr;
wasi_addr_to_bh_sockaddr(src_addr, &sockaddr);
}

/* Consume bh_sockaddr_t instead of __wasi_addr_t */
Expand Down
1 change: 1 addition & 0 deletions core/shared/platform/zephyr/platform_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ typedef struct zephyr_fs_desc {
};
bool is_dir;
bool used;
uint32_t dir_index; // DSK: supprt for rewind and seek
} zephyr_fs_desc;

// definition of zephyr_handle
Expand Down
Loading
Loading