fix Pool + interop, update wasmtime

trealla-prolog · Jul 24, 2023 · a77d53e · a77d53e
1 parent a509390
commit a77d53e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/trealla-prolog/go
 go 1.19
 
 require (
-	github.com/bytecodealliance/wasmtime-go/v9 v9.0.0
+	github.com/bytecodealliance/wasmtime-go/v11 v11.0.0
 	golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
 )
 

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/bytecodealliance/wasmtime-go/v9 v9.0.0 h1:lkyiPbbo++bSmDyJVxDQwxxaiu3LOFVm0iBHnTS1W5A=
-github.com/bytecodealliance/wasmtime-go/v9 v9.0.0/go.mod h1:zpOxt1j5vj44AzXZVhS4H+hr39vMk4hDlyC42kGksbU=
+github.com/bytecodealliance/wasmtime-go/v11 v11.0.0 h1:SwLgbjbFpQ1tf5vIbWexaZABezBSL8WmzP+foLyi0lE=
+github.com/bytecodealliance/wasmtime-go/v11 v11.0.0/go.mod h1:9btfEuCkOP7EDR9a7LqDXrfQ7dtWeGlDHt3buV5UyjY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/src/trealla b/src/trealla
diff --git a/trealla/interop.go b/trealla/interop.go
@@ -4,7 +4,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/bytecodealliance/wasmtime-go/v9"
+	"github.com/bytecodealliance/wasmtime-go/v11"
 )
 
 // Predicate is a Prolog predicate implemented in Go.

diff --git a/trealla/libtpl.wasm b/trealla/libtpl.wasm
diff --git a/trealla/pool.go b/trealla/pool.go
@@ -2,6 +2,7 @@ package trealla
 
 import (
 	"fmt"
+	"log"
 	"runtime"
 	"sync"
 )
@@ -34,6 +35,7 @@ func NewPool(options ...PoolOption) (*Pool, error) {
 	if err != nil {
 		return nil, err
 	}
+	log.Println("daddy procs", pl.(*prolog).procs)
 	pool.canon = pl.(*prolog)
 	pool.children = make([]*prolog, pool.size)
 	pool.idle = make(chan *prolog, pool.size)

diff --git a/trealla/prolog.go b/trealla/prolog.go
@@ -12,7 +12,7 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/bytecodealliance/wasmtime-go/v9"
+	"github.com/bytecodealliance/wasmtime-go/v11"
 	"golang.org/x/exp/maps"
 )
 
@@ -207,7 +207,7 @@ func (pl *prolog) init(parent *prolog) error {
 		pl.mu = new(sync.Mutex)
 		pl.running = make(map[int32]*query)
 		pl.spawning = make(map[int32]*query)
-		pl.procs = maps.Clone(pl.procs)
+		pl.procs = maps.Clone(parent.procs)
 		pl.preopen = parent.preopen
 		pl.dirs = parent.dirs
 		pl.library = parent.library

diff --git a/trealla/wasm.go b/trealla/wasm.go
@@ -3,7 +3,7 @@ package trealla
 import (
 	_ "embed"
 
-	"github.com/bytecodealliance/wasmtime-go/v9"
+	"github.com/bytecodealliance/wasmtime-go/v11"
 )
 
 //go:embed libtpl.wasm
@@ -23,6 +23,10 @@ func init() {
 	cfg.SetWasmSIMD(true)
 	cfg.SetWasmMultiValue(true)
 	cfg.SetWasmMultiMemory(true)
+
+	// libtpl.wasm is built with: -zstack-size=8388608
+	// cfg.SetMaxWasmStack(8388608)
+
 	// cfg.CacheConfigLoadDefault()
 	wasmEngine = wasmtime.NewEngineWithConfig(cfg)