Skip to content
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

fix: Use fresh instance on each new plugin invocation #413

Merged
merged 3 commits into from
Apr 5, 2023
Merged

fix: Use fresh instance on each new plugin invocation #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdadc3e
fix: Use fresh instance on each new plugin invocation
ospencer Apr 5, 2023
f0cfcda
Skip test that depends on 1password page html, see #414
javorszky Apr 5, 2023
f2a8fac
Pass in instance we want to close to deferred function
javorszky Apr 5, 2023
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
2 changes: 2 additions & 0 deletions sat/engine2/enginetest/engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ func TestEngineSetRespHeader(t *testing.T) {
}

func TestEngineFetch(t *testing.T) {
t.Skip("This test gets skipped until https://github.com/suborbital/e2core/issues/414 is resolved")

ref, err := engine2.WasmRefFromFile("./testdata/fetch/fetch.wasm")
if err != nil {
t.Error(err)
Expand Down
15 changes: 11 additions & 4 deletions sat/engine2/runtime/pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,21 @@ func (ip *InstancePool) RemoveInstance() error {

// UseInstance provides an instance from the environment's pool to be used by a callback function
func (ip *InstancePool) UseInstance(ctx *scheduler.Ctx, instFunc func(*instance.Instance, int32)) error {
// grab an instance from the available queue and then
// return it to the environment when finished
// grab an instance from the available queue
inst := <-ip.availableInstances

defer func() {
ip.availableInstances <- inst
go func() {
// prepare a new instance
if err := ip.AddInstance(); err != nil {
panic(err)
}
}()

defer func(it *instance.Instance) {
it.Close()
it = nil
}(inst)

// generate a random identifier as a reference to the instance in use to
// easily allow the Wasm module to reference itself when calling back over the FFI
ident, err := instance.Store(inst)
Expand Down