fix __xgo_on_gonewproc, see #67

xhd2015 · Apr 16, 2024 · 56315be · 56315be
1 parent ccc82ab
commit 56315be
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -74,7 +74,6 @@ go mod init demo
 package demo_test
 
 import (
-	"context"
 	"testing"
 
 	"github.com/xhd2015/xgo/runtime/mock"
@@ -86,7 +85,7 @@ func MyFunc() string {
 
 func TestFuncMock(t *testing.T) {
 	mock.Patch(MyFunc, func() string {
-        return "mock func"
+		return "mock func"
 	})
 	text := MyFunc()
 	if text != "mock func" {

diff --git a/README_zh_cn.md b/README_zh_cn.md
@@ -70,7 +70,6 @@ go mod init demo
 package demo_test
 
 import (
-	"context"
 	"testing"
 
 	"github.com/xhd2015/xgo/runtime/mock"
@@ -81,8 +80,8 @@ func MyFunc() string {
 }
 
 func TestFuncMock(t *testing.T) {
-    mock.Patch(MyFunc, func() string {
-        return "mock func"
+	mock.Patch(MyFunc, func() string {
+		return "mock func"
 	})
 	text := MyFunc()
 	if text != "mock func" {

diff --git a/cmd/xgo/patch.go b/cmd/xgo/patch.go
@@ -52,7 +52,7 @@ func patchRuntimeAndCompiler(origGoroot string, goroot string, xgoSrc string, go
 	}
 
 	// runtime
-	err := patchRuntimeAndTesting(goroot)
+	err := patchRuntimeAndTesting(goroot, goVersion)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/xgo/patch/runtime_def.go b/cmd/xgo/patch/runtime_def.go
@@ -8,9 +8,8 @@ __xgo_on_init_finished_callbacks = nil
 `
 
 const RuntimeProcGoroutineCreatedPatch = `for _, fn := range __xgo_on_gonewproc_callbacks {
-	fn(uintptr(unsafe.Pointer(newg)))
+	fn(uintptr(unsafe.Pointer(xgo_newg)))
 }
-return newg
 `
 
 // added after goroutine exit1

diff --git a/cmd/xgo/patch_runtime.go b/cmd/xgo/patch_runtime.go
@@ -57,8 +57,8 @@ var runtimeFiles = []_FilePath{
 	timeSleep,
 }
 
-func patchRuntimeAndTesting(goroot string) error {
-	err := patchRuntimeProc(goroot)
+func patchRuntimeAndTesting(goroot string, goVersion *goinfo.GoVersion) error {
+	err := patchRuntimeProc(goroot, goVersion)
 	if err != nil {
 		return err
 	}
@@ -129,7 +129,7 @@ func addRuntimeFunctions(goroot string, goVersion *goinfo.GoVersion, xgoSrc stri
 	return true, os.WriteFile(dstFile, content, 0755)
 }
 
-func patchRuntimeProc(goroot string) error {
+func patchRuntimeProc(goroot string, goVersion *goinfo.GoVersion) error {
 	procFile := filepath.Join(goroot, filepath.Join(runtimeProc...))
 	anchors := []string{
 		"func main() {",
@@ -148,12 +148,52 @@ func patchRuntimeProc(goroot string) error {
 			patch.RuntimeProcGoroutineExitPatch,
 		)
 
-		content = replaceContentAfter(content,
+		procDecl := `func newproc(fn`
+		newProc := `newg := newproc1(fn, gp, pc)`
+		if goVersion.Major == 1 && goVersion.Minor <= 17 {
+			procDecl = `func newproc(siz int32`
+			newProc = `newg := newproc1(fn, argp, siz, gp, pc)`
+		}
+
+		// see https://github.com/xhd2015/xgo/issues/67
+		content = addContentAtIndex(
+			content,
+			"/*<begin declare_xgo_newg>*/", "/*<end declare_xgo_newg>*/",
+			[]string{
+				procDecl,
+				`systemstack(func() {`,
+				newProc,
+			},
+			1,
+			true,
+			"var xgo_newg *g",
+		)
+		content = addContentAtIndex(
+			content,
+			"/*<begin set_xgo_newg>*/", "/*<end set_xgo_newg>*/",
+			[]string{
+				procDecl,
+				`systemstack(func() {`,
+				newProc,
+				"\n",
+			},
+			3,
+			false,
+			"xgo_newg = newg",
+		)
+
+		content = addContentAtIndex(content,
 			"/*<begin add_go_newproc_callback>*/", "/*<end add_go_newproc_callback>*/",
 			[]string{
-				"func newproc1(", "*g {",
+				procDecl,
+				`systemstack(func() {`,
+				newProc,
+				"\n",
+				"})",
+				"}",
 			},
-			"return newg",
+			5,
+			true,
 			patch.RuntimeProcGoroutineCreatedPatch,
 		)
 		return content, nil

diff --git a/cmd/xgo/version.go b/cmd/xgo/version.go
@@ -3,8 +3,8 @@ package main
 import "fmt"
 
 const VERSION = "1.0.24"
-const REVISION = "26299095b0e070cff5e5daa2d6e59cea598d1b35+1"
-const NUMBER = 183
+const REVISION = "ccc82ab8c3514f4c1a71039dad9ee7c30109935c+1"
+const NUMBER = 184
 
 func getRevision() string {
 	revSuffix := ""

diff --git a/runtime/core/version.go b/runtime/core/version.go
@@ -7,8 +7,8 @@ import (
 )
 
 const VERSION = "1.0.24"
-const REVISION = "26299095b0e070cff5e5daa2d6e59cea598d1b35+1"
-const NUMBER = 183
+const REVISION = "ccc82ab8c3514f4c1a71039dad9ee7c30109935c+1"
+const NUMBER = 184
 
 // these fields will be filled by compiler
 const XGO_VERSION = ""