tinygo: revise and simplify wasmtime argument handling #4555
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Use wasmtime run subcommand instead of bare wasmtime. This enables use of wasmtime serve or other subcommands. - Simplify buildAndRun, condensing wasmtime handling into a single section handling env vars and dir args. - Only set PWD to the package dir if running tests, but not with tinygo run.
ydnar
commented
Oct 27, 2024
| @@ -925,7 +927,7 @@ func buildAndRun(pkgName string, config *compileopts.Config, stdout io.Writer, c | |||
|
|
|||
| // Run binary. | |||
| if config.Options.PrintCommands != nil { | |||
| config.Options.PrintCommands(cmd.Path, cmd.Args...) | |||
| config.Options.PrintCommands(cmd.Path, cmd.Args[1:]...) | |||
There was a problem hiding this comment.
Running tinygo run -x ... repeated the full path to wasmtime and wasmtime.
ydnar
added a commit
to ydnar/wasi-http-go
that referenced
this pull request
Oct 27, 2024
deadprogram
approved these changes
Oct 27, 2024
3 tasks
|
The |
|
Yes that still works. The equivalent |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR implements 3 related changes to how TinyGo processes arguments for the
wasmtimeemulator. I ran across the issue related to trying to usewasmtime servein a custom target file for my WasmCon talk next month.It adds support for alternative
wasmtimesubcommands likeserve, simplifies the Wasmtime-specific code paths, and fixes PWD handling fortinygo runwhen not running tests. I recommend reviewing by commit to see the individual changes.Detailed changes:
buildAndRun, condensingwasmtimehandling into a single section handling--envand--dirargs.wasmtime runsubcommand instead of barewasmtime. This enables use ofwasmtime serveor other subcommands. The key change is that emulator arguments are inserted after the subcommand, e.g.run.PWDto the package dir only when running tests, which allowstinygo run --target wasip1to run withPWD=..-x(PrintCommands) where it repeated the full path and name of the command.