Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[wasi] wasi:http + WasiHttpHandler #103752

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

Merged
merged 15 commits into from
Aug 1, 2024
Merged

[wasi] wasi:http + WasiHttpHandler #103752

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e4e09ed
- rebase
pavelsavara Jul 22, 2024
6a5b4ac
more
pavelsavara Jul 22, 2024
09934af
fix
pavelsavara Jul 22, 2024
05ed759
fix provisioning
pavelsavara Jul 23, 2024
da07824
fix WBT
pavelsavara Jul 23, 2024
a293990
Merge branch 'main' into wasip2-2
pavelsavara Jul 23, 2024
716bedf
Merge branch 'main' into wasip2-2
pavelsavara Jul 30, 2024
eeab643
fix samples and WBT
pavelsavara Jul 30, 2024
9dbfaf2
Merge branch 'main' into wasip2-2
pavelsavara Jul 31, 2024
3358a40
fix WBT
pavelsavara Jul 31, 2024
930fc56
feedback
pavelsavara Jul 31, 2024
06d0b8d
Merge branch 'main' into wasip2-2
pavelsavara Jul 31, 2024
c684605
lib testing
pavelsavara Jul 31, 2024
ad3872a
Merge branch 'main' into wasip2-2
pavelsavara Aug 1, 2024
644e41d
feedback, cleanup
pavelsavara Aug 1, 2024
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
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@pavelsavara
pavelsavara committed Jul 22, 2024
commit 09934affd59fcad7ac5d2a273b2d8b98aa36018f
2 changes: 1 addition & 1 deletion src/mono/wasi/build/WasiApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
<_WasiLinkStepArgs Condition="'$(OS)' != 'Windows_NT'" Include="@(_WasiFilePathForFixup -> '&quot;%(Identity)&quot;')" />

<_WasiLinkStepArgs Include="-Wl,--export=malloc,--export=free,--export=__heap_base,--export=__data_end" />
<!-- keep in sync with src\mono\wasi\build\WasiApp.Native.targets -->
<!-- keep in sync with src\mono\wasi\wasi.proj -->
<!-- keep in sync with src\native\libs\CMakeLists.txt -->
<_WasiLinkStepArgs Include="-Wl,-z,stack-size=8388608,-lwasi-emulated-process-clocks,-lwasi-emulated-signal,-lwasi-emulated-mman"/>
<!-- TODO this makes hard dependency on wasi:[email protected], ideally this would be trimmable when HTTP is not used -->
Expand Down
7 changes: 4 additions & 3 deletions src/mono/wasi/wasi.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,9 @@
<_WasiCompileFlags Include="-D_WASI_EMULATED_PROCESS_CLOCKS"/>
<_WasiCompileFlags Include="-D_WASI_EMULATED_SIGNAL"/>
<_WasiCompileFlags Include="-D_WASI_EMULATED_MMAN"/>
<!-- keep in sync with src\mono\wasi\build\WasiApp.Native.targets -->
<!-- keep in sync with src\mono\wasi\build\WasiApp.targets -->
<!-- keep in sync with src\native\libs\CMakeLists.txt -->
<_WasiLinkFlags Include="-Wl,-z,stack-size=8388608,--initial-memory=52428800,-lwasi-emulated-process-clocks,-lwasi-emulated-signal,-lwasi-emulated-mman"/>
<!-- this makes hard dependency on wasi:[email protected] for the default build of dotnet.wasm. It would be ideal to have optional imports instead, but WASI doesn't support it yet -->
<_WasiLinkFlags Include="-Wl,--component-type,&quot;$([MSBuild]::NormalizePath('$(RepoRoot)', 'src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld_component_type.wit').Replace('\','/'))&quot;"/>
</ItemGroup>

<PropertyGroup>
Expand Down Expand Up @@ -215,6 +213,9 @@
<CMakeConfigurationLinkFlags Condition="'$(Configuration)' == 'Debug'" >$(CMakeConfigurationWasiFlags)</CMakeConfigurationLinkFlags>
<CMakeConfigurationLinkFlags Condition="'$(Configuration)' == 'Release'">-O2</CMakeConfigurationLinkFlags>

<!-- this makes hard dependency on wasi:[email protected] for the default build of dotnet.wasm. It would be ideal to have optional imports instead, but WASI doesn't support it yet -->
<CMakeConfigurationLinkFlags>$(CMakeBuildRuntimeConfigureCmd) -Wl,--component-type,&quot;$([MSBuild]::NormalizePath('$(RepoRoot)', 'src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttpWorld_component_type.wit').Replace('\','/'))&quot;</CMakeConfigurationLinkFlags>

<CMakeBuildRuntimeConfigureCmd>cmake $(MSBuildThisFileDirectory)runtime</CMakeBuildRuntimeConfigureCmd>
<CMakeBuildRuntimeConfigureCmd Condition="'$(OS)' == 'Windows_NT'">cmake -G Ninja $(MSBuildThisFileDirectory)runtime</CMakeBuildRuntimeConfigureCmd>

Expand Down
2 changes: 1 addition & 1 deletion src/native/libs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
add_compile_options(-D_WASI_EMULATED_PROCESS_CLOCKS)
add_compile_options(-D_WASI_EMULATED_SIGNAL)
add_compile_options(-D_WASI_EMULATED_MMAN)
# keep in sync with src\mono\wasi\build\WasiApp.Native.targets
# keep in sync with src\mono\wasi\build\WasiApp.targets
# keep in sync with src\mono\wasi\wasi.proj
add_link_options(-Wl,-z,stack-size=1048576,--initial-memory=5242880,--max-memory=52428800,-lwasi-emulated-process-clocks,-lwasi-emulated-signal,-lwasi-emulated-mman)
endif ()
Expand Down