gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-10-25 18:31:17 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Resolved a bug in the socket API example (#4667)

Browse Source 
* Fixed a bug in its script
* Applied the wasi-sdk-pthread toolchain file

Related issue: #4649
This commit is contained in:
Keisuke Horii 2025-10-16 11:19:19 +09:00 committed by GitHub
parent 7aff7372e2
commit 8be32732ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
samples/socket-api/CMakeLists.txt
View File

@ -34,7 +34,7 @@ endif()
message(CHECK_START "Detecting WASI_TOOLCHAIN_FILE at ${WASI_SDK_DIR}") message(CHECK_START "Detecting WASI_TOOLCHAIN_FILE at ${WASI_SDK_DIR}")
find_file(WASI_TOOLCHAIN_FILE find_file(WASI_TOOLCHAIN_FILE
wasi-sdk.cmake wasi-sdk-pthread.cmake
PATHS "${WASI_SDK_DIR}/share/cmake" PATHS "${WASI_SDK_DIR}/share/cmake"
NO_DEFAULT_PATH NO_DEFAULT_PATH
NO_CMAKE_FIND_ROOT_PATH NO_CMAKE_FIND_ROOT_PATH
@ -46,7 +46,7 @@ else()
endif() endif()
if(WASI_TOOLCHAIN_FILE-NOTFOUND) if(WASI_TOOLCHAIN_FILE-NOTFOUND)
message(FATAL_ERROR "Can not find wasi-sdk.cmake under ${WASI_SDK_DIR}") message(FATAL_ERROR "Can not find wasi-sdk-pthread.cmake under ${WASI_SDK_DIR}")
endif() endif()
message(CHECK_START "Detecting WASI_SYS_ROOT at ${WASI_SDK_DIR}") message(CHECK_START "Detecting WASI_SYS_ROOT at ${WASI_SDK_DIR}")
@ -80,10 +80,7 @@ ExternalProject_Add(wasm-app
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/wasm-src SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/wasm-src
UPDATE_COMMAND "" UPDATE_COMMAND ""
PATCH_COMMAND "" PATCH_COMMAND ""
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy CONFIGURE_COMMAND ${CMAKE_COMMAND}
${CMAKE_CURRENT_SOURCE_DIR}/../../wamr-sdk/app/libc-builtin-sysroot/include/pthread.h
${CMAKE_CURRENT_SOURCE_DIR}/wasm-src/inc
&& ${CMAKE_COMMAND}
-DWASI_SDK_PREFIX=${WASI_SDK_DIR} -DWASI_SDK_PREFIX=${WASI_SDK_DIR}
-DCMAKE_TOOLCHAIN_FILE=${WASI_TOOLCHAIN_FILE} -DCMAKE_TOOLCHAIN_FILE=${WASI_TOOLCHAIN_FILE}
-DCMAKE_SYSROOT=${WASI_SYS_ROOT} -DCMAKE_SYSROOT=${WASI_SYS_ROOT}
@ -170,8 +167,8 @@ set(WAMR_BUILD_AOT 1)
set(WAMR_BUILD_JIT 0) set(WAMR_BUILD_JIT 0)
set(WAMR_BUILD_LIBC_BUILTIN 1) set(WAMR_BUILD_LIBC_BUILTIN 1)
set(WAMR_BUILD_LIBC_WASI 1) set(WAMR_BUILD_LIBC_WASI 1)
set(WAMR_BUILD_LIB_PTHREAD 1)
set(WAMR_BUILD_REF_TYPES 1) set(WAMR_BUILD_REF_TYPES 1)
set(WAMR_BUILD_LIB_WASI_THREADS 1)
# compiling and linking flags # compiling and linking flags
if (NOT (CMAKE_C_COMPILER MATCHES ".*clang.*" OR CMAKE_C_COMPILER_ID MATCHES ".*Clang")) if (NOT (CMAKE_C_COMPILER MATCHES ".*clang.*" OR CMAKE_C_COMPILER_ID MATCHES ".*Clang"))

2
samples/socket-api/sample_test_run.py
View File

@ -31,7 +31,7 @@ def run_cmd(cmd, cwd):
shlex.split(cmd), cwd=cwd, check=False, capture_output=True shlex.split(cmd), cwd=cwd, check=False, capture_output=True
) )
if (qry_prc.returncode != 0): if (qry_prc.returncode != 0):
print("Run {} failed, return {}".format(cmd), qry_prc.returncode) print("Run {} failed, return {}".format(cmd, qry_prc.returncode))
return return
print("return code: {}, output:\n{}".format(qry_prc.returncode, print("return code: {}, output:\n{}".format(qry_prc.returncode,
qry_prc.stdout.decode())) qry_prc.stdout.decode()))