Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
963c40d
first version of debug wasi
thaystg Mar 28, 2022
c68c68b
remove comment
thaystg Mar 28, 2022
2c12c53
fixing readme
thaystg Mar 28, 2022
4633f74
Fix compilation error
thaystg Mar 29, 2022
0f31247
fix compilation error
thaystg Mar 29, 2022
fc4aac9
fix compilation
thaystg Mar 29, 2022
a080cb9
addressing steve comment
thaystg Mar 29, 2022
6e108c7
Stepping working
thaystg Mar 29, 2022
22f941f
Merge branch 'dotnet:main' into debug_wasi
thaystg Apr 18, 2022
2a6bc9f
fix debugging aspnetcore app
thaystg Apr 18, 2022
b2afaa2
wrong merge
thaystg Apr 18, 2022
be9afd0
addressing @viniciusjarina comment
thaystg Apr 18, 2022
a71d0d7
addressing steve comments
thaystg May 12, 2022
6b031f0
work for remote debugging
thaystg May 13, 2022
b31ff0d
make it work on windows
thaystg May 13, 2022
d79ad4c
Update mini-wasi-debugger.c
thaystg May 13, 2022
90456f3
Update mini-wasi-debugger.c
thaystg May 18, 2022
bdd37da
Update mini-wasi-debugger.c
thaystg May 18, 2022
b402eca
Trying to fix compilation
thaystg May 18, 2022
9a2e424
Update src/mono/mono/component/mini-wasi-debugger.c
thaystg Jul 14, 2022
5190080
Update src/mono/mono/component/mini-wasi-debugger.c
thaystg Jul 14, 2022
7243467
Update src/mono/mono/component/mini-wasi-debugger.c
thaystg Jul 14, 2022
aa653ae
Update src/mono/mono/component/debugger-agent.c
thaystg Jul 14, 2022
7c9b8f4
Update src/mono/mono/component/debugger-agent.c
thaystg Jul 14, 2022
0091c0b
Update src/mono/mono/mini/interp/interp.c
thaystg Jul 14, 2022
a3c2022
Update src/mono/mono/mini/interp/interp.c
thaystg Jul 14, 2022
d727f69
Update src/mono/wasi/Makefile
thaystg Jul 14, 2022
09f1850
Update src/mono/wasi/mono-wasi-driver/driver.c
thaystg Jul 14, 2022
840717e
Update src/mono/mono/component/debugger-agent.c
thaystg Jul 14, 2022
7b396d3
Addressing @radical comments
thaystg Jul 14, 2022
3e9e3d8
Merge remote-tracking branch 'origin/main' into debug_wasi
thaystg Jul 14, 2022
cd8983c
fix compilation errors
thaystg Jul 20, 2022
12de7e8
Merge branch 'dotnet:main' into debug_wasi
thaystg Jul 20, 2022
43ec98d
fixing readme
thaystg Jul 21, 2022
4a70b54
debugger working again
thaystg Jul 21, 2022
feb18cb
addressing @BrzVlad comments
thaystg Jul 21, 2022
e80a3fa
Merge branch 'debug_wasi' of github.com:thaystg/runtime into debug_wasi
thaystg Jul 21, 2022
a1a44b0
Addressing @radical comments
thaystg Jul 21, 2022
5baac8d
Merge branch 'main' into debug_wasi
thaystg Jul 28, 2022
1bc0f34
Fix merge
thaystg Jul 28, 2022
644d293
Fix merge
thaystg Jul 28, 2022
fdc850b
Update diagnostics_server.c
thaystg Jul 29, 2022
9ef2a15
Treat root directory as always existing, even if WASI isn't granting …
SteveSandersonMS Mar 9, 2022
6a71fff
Update sample build config
SteveSandersonMS Mar 23, 2022
a636cba
Stop trying to use JS (browser) APIs for crypto, as there is no JS in…
SteveSandersonMS Jul 29, 2022
ea1a92d
Revert unneeded change
SteveSandersonMS Jul 29, 2022
94ea406
Merge pull request #2 from dotnet/stevesa/aspnetcore-on-atmo-with-deb…
thaystg Jul 29, 2022
02d5ee4
Apply suggestions from code review
thaystg Aug 4, 2022
d52af45
Addressing @radical comments
thaystg Aug 4, 2022
0ab14c6
Merge branch 'dotnet:main' into debug_wasi
thaystg Aug 4, 2022
da478a0
Addressing @radical comments
thaystg Aug 4, 2022
711e8e6
fixing debugger behavior and addressing @radical comments
thaystg Aug 5, 2022
0891b49
Addressing @ SteveSandersonMS comments
thaystg Aug 5, 2022
385ae41
Apply suggestions from code review
thaystg Aug 8, 2022
0d0ad4f
Addressing radical comments
thaystg Aug 8, 2022
be02fc9
Merge remote-tracking branch 'origin/main' into debug_wasi
radical Aug 8, 2022
ec99f07
[wasi] Provision wasmtime as needed
radical Aug 8, 2022
7d57f68
[wasi] build, and run wasi sample on CI
radical Aug 8, 2022
b626963
[wasi] don't install wasmtime by default, but do that for CI
radical Aug 8, 2022
c99ecaa
[wasi] Show a useful error if wasmtime is not found
radical Aug 8, 2022
9ab2ea8
[wasi] provision ninja
radical Aug 8, 2022
fbd7dc8
Fix path
radical Aug 9, 2022
01a03ef
Fix warnings to make CI green
thaystg Aug 9, 2022
57ad7ba
debug
radical Aug 9, 2022
6eb0b47
Move building wasi into a separate yml step, so it gets built after t…
radical Aug 9, 2022
d3d033a
fix yml
radical Aug 9, 2022
ae703d6
Enable wasi build on libtests job
radical Aug 9, 2022
09a60af
Fix yml again
radical Aug 9, 2022
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
40 changes: 40 additions & 0 deletions eng/pipelines/common/templates/additional-steps-then-helix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
parameters:
archType: ''
buildConfig: ''
condition: always()
creator: ''
extraHelixArguments: ''
helixQueues: ''
interpreter: ''
osGroup: ''
additionalSteps: []
runTests: true
runtimeFlavor: ''
shouldContinueOnError: false
targetRid: ''
testRunNamePrefixSuffix: ''
testScope: 'innerloop' # innerloop | outerloop | all
scenarios: ['normal']

steps:
- ${{ if ne(parameters.additionalSteps, '') }}:
- ${{ each additionalStep in parameters.additionalSteps }}:
- ${{ additionalStep }}

- ${{ if eq(parameters.runTests, true) }}:
- template: /eng/pipelines/libraries/helix.yml
parameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
archType: ${{ parameters.archType }}
buildConfig: ${{ parameters.buildConfig }}
helixQueues: ${{ parameters.helixQueues }}
osGroup: ${{ parameters.osGroup }}
targetRid: ${{ parameters.targetRid }}
testRunNamePrefixSuffix: ${{ parameters.testRunNamePrefixSuffix }}
testScope: ${{ parameters.testScope }}
interpreter: ${{ parameters.interpreter }}
condition: ${{ parameters.condition }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
extraHelixArguments: ${{ parameters.extraHelixArguments }} /p:BrowserHost=$(_hostedOs)
creator: dotnet-bot
scenarios: ${{ parameters.scenarios }}
11 changes: 10 additions & 1 deletion eng/pipelines/common/templates/wasm-library-tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
parameters:
alwaysRun: false
buildAndRunWasi: false
extraBuildArgs: ''
extraHelixArgs: ''
isExtraPlatformsBuild: false
Expand Down Expand Up @@ -48,8 +49,16 @@ jobs:
eq(dependencies.evaluate_paths.outputs['SetPathVars_allwasm.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true))
# extra steps, run tests
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
extraStepsTemplate: /eng/pipelines/common/templates/additional-steps-then-helix.yml
extraStepsParameters:
additionalSteps:
- ${{ if eq(parameters.buildAndRunWasi, true) }}:
- script: >-
make -C src/mono/wasi provision-deps all &&
make -C src/mono/wasi/sample/console run
name: build_wasi
displayName: Build Wasi, and run a sample

creator: dotnet-bot
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
extraHelixArguments: /p:BrowserHost=$(_hostedOs) ${{ parameters.runSmokeOnlyArg }} ${{ parameters.extraHelixArgs }}
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ jobs:
parameters:
platforms:
- Browser_wasm
buildAndRunWasi: true
alwaysRun: ${{ variables.isRollingBuild }}
scenarios:
- normal
Expand Down
5 changes: 3 additions & 2 deletions src/mono/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,14 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
set(INTERNAL_ZLIB 1)
elseif(CMAKE_SYSTEM_NAME STREQUAL "WASI")
set(HOST_WASI 1)
add_definitions(-D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_MMAN)
add_definitions(-D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_MMAN -DHOST_WASI)
add_definitions(-DNO_GLOBALIZATION_SHIM)
add_definitions(-D_THREAD_SAFE)
add_definitions(-DGEN_PINVOKE)
set(DISABLE_SHARED_LIBS 1)
set(INTERNAL_ZLIB 1)
set(DISABLE_EXECUTABLES 1)
set(DISABLE_COMPONENTS 1)
set(STATIC_COMPONENTS 1)

set(WASI_DRIVER_SOURCES
wasi/mono-wasi-driver/driver.c
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/component/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ set(${MONO_DEBUGGER_COMPONENT_NAME}-sources
${MONO_COMPONENT_PATH}/debugger-state-machine.h
${MONO_COMPONENT_PATH}/debugger-state-machine.c
${MONO_COMPONENT_PATH}/mini-wasm-debugger.c
${MONO_COMPONENT_PATH}/mini-wasi-debugger.c
${MONO_COMPONENT_PATH}/debugger-protocol.h
${MONO_COMPONENT_PATH}/debugger-protocol.c
)
Expand Down
Loading