Use wasilibs nottinygc (#140)

corazawaf · Feb 3, 2023 · 13492e3 · 13492e3
1 parent 21ebf45
commit 13492e3
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 223 deletions.
diff --git a/buildtools/bdwgc/Dockerfile b/buildtools/bdwgc/Dockerfile
diff --git a/buildtools/mimalloc/Dockerfile b/buildtools/mimalloc/Dockerfile
diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/wasilibs/go-aho-corasick v0.2.0
 	github.com/wasilibs/go-libinjection v0.1.0
 	github.com/wasilibs/go-re2 v0.1.0
+	github.com/wasilibs/nottinygc v0.0.0-20230202022930-bb230a97db8e
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -40,6 +40,8 @@ github.com/wasilibs/go-libinjection v0.1.0 h1:WivsHc8c0cNWETEVhG0NpCezxvCn9zlVli
 github.com/wasilibs/go-libinjection v0.1.0/go.mod h1:yRoVK5Ks0kH65fJB1uzppuEn77pJmP8hagoAdPcgbtI=
 github.com/wasilibs/go-re2 v0.1.0 h1:+pcjlvge6E9WWU4eaMlULRikEUkhPDXSFfCF5p7htMI=
 github.com/wasilibs/go-re2 v0.1.0/go.mod h1:F91Yac+zPNDFrrd8fl4mSd7+TTu2tYiX56BEIEPQl2M=
+github.com/wasilibs/nottinygc v0.0.0-20230202022930-bb230a97db8e h1:xzrL/Fd514ijzrySqTQgCLyGVOWbQBs7qhwLqSrR/2s=
+github.com/wasilibs/nottinygc v0.0.0-20230202022930-bb230a97db8e/go.mod h1:oDcIotskuYNMpqMF23l7Z8uzD4TC0WXHK8jetlB3HIo=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
 golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=

diff --git a/init_tinygo.go b/init_tinygo.go
@@ -5,7 +5,13 @@
 
 package main
 
-import _ "github.com/corazawaf/coraza-proxy-wasm/internal/gc"
+import _ "github.com/wasilibs/nottinygc"
 
-// #cgo LDFLAGS: lib/libmimalloc.a lib/libgc.a
-import "C"
+// Compiled by nottinygc for delayed free but Envoy doesn't stub it yet,
+// luckily nottinygc doesn't actually call the function, so it's fine to
+// stub it out.
+
+//export sched_yield
+func sched_yield() int32 {
+	return 0
+}
diff --git a/internal/gc/doc.go b/internal/gc/doc.go
diff --git a/internal/gc/gc_conservative.go b/internal/gc/gc_conservative.go
diff --git a/internal/gc/mem.go b/internal/gc/mem.go
diff --git a/internal/gc/memstats.go b/internal/gc/memstats.go
diff --git a/lib/libgc.a b/lib/libgc.a
diff --git a/lib/libinjection.a b/lib/libinjection.a
diff --git a/lib/libmimalloc.a b/lib/libmimalloc.a
diff --git a/lib/libre2.a b/lib/libre2.a
diff --git a/magefiles/magefile.go b/magefiles/magefile.go
@@ -165,7 +165,7 @@ func Build() error {
 		return err
 	}
 
-	var buildTags []string
+	buildTags := []string{"custommalloc"}
 	if os.Getenv("TIMING") == "true" {
 		buildTags = append(buildTags, "timing", "proxywasm_timing")
 	}
@@ -193,32 +193,14 @@ func Build() error {
 	script := fmt.Sprintf(`
 cd /src && \
 tinygo build -gc=custom -opt=2 -o %s -scheduler=none -target=wasi %s`, filepath.Join("build", "mainraw.wasm"), buildTagArg)
-	if err := sh.RunV("docker", "run", "--pull=always", "--rm", "-v", fmt.Sprintf("%s:/src", wd), "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-tinygo:sha-63723e9",
+	if err := sh.RunV("docker", "run", "--pull=always", "--rm", "-v", fmt.Sprintf("%s:/src", wd), "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-tinygo:sha-96443bb",
 		"bash", "-c", script); err != nil {
 		return err
 	}
 
 	return patchWasm(filepath.Join("build", "mainraw.wasm"), filepath.Join("build", "main.wasm"), initialPages)
 }
 
-// UpdateLibs updates the C++ filter dependencies.
-func UpdateLibs() error {
-	libs := []string{"bdwgc", "mimalloc"}
-	for _, lib := range libs {
-		if err := sh.RunV("docker", "build", "-t", "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-"+lib, filepath.Join("buildtools", lib)); err != nil {
-			return err
-		}
-		wd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-		if err := sh.RunV("docker", "run", "-it", "--rm", "-v", fmt.Sprintf("%s:/out", filepath.Join(wd, "lib")), "ghcr.io/corazawaf/coraza-proxy-wasm/buildtools-"+lib); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 // E2e runs e2e tests with a built plugin against the example deployment. Requires docker-compose.
 func E2e() error {
 	if err := sh.RunV("docker-compose", "--file", "e2e/docker-compose.yml", "build", "--pull"); err != nil {

diff --git a/wasmplugin/memstats_on.go b/wasmplugin/memstats_on.go
@@ -6,22 +6,19 @@
 package wasmplugin
 
 import (
-	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
+	"runtime"
 
-	"github.com/corazawaf/coraza-proxy-wasm/internal/gc"
+	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
 )
 
 func logMemStats() {
-	ms := gc.MemStats{}
-	gc.ReadMemStats(&ms)
+	ms := runtime.MemStats{}
+	runtime.ReadMemStats(&ms)
 	proxywasm.LogDebugf(
-		"Sys: %d, HeapSys: %d, HeapAlloc: %d, HeapIdle: %d, HeapReleased: %d, TotalAlloc: %d, NumGC: %d, BytesSinceGC: %d",
+		"Sys: %d, HeapSys: %d, HeapIdle: %d, HeapReleased: %d, TotalAlloc: %d",
 		ms.Sys,
 		ms.HeapSys,
-		ms.HeapAlloc,
 		ms.HeapIdle,
 		ms.HeapReleased,
-		ms.TotalAlloc,
-		ms.NumGC,
-		ms.BytesSinceGC)
+		ms.TotalAlloc)
 }