enable trace snapshot

cmd/xgo/runtime_gen/trace/stack.go

@@ -27,8 +27,12 @@ type Stack struct {
 	Begin int64 // us
 	End   int64 // us
 
-	Args     core.Object
-	Results  core.Object
+	Args    core.Object
+	Results core.Object
+
+	// is recorded as snapshot
+	Snapshot bool
+
 	Panic    bool
 	Error    error
 	Children []*Stack
@@ -177,6 +181,7 @@ func (c *Stack) Export(opts *ExportOptions) *StackExport {
 		End:      c.End,
 		Args:     args,
 		Results:  results,
+		Snapshot: c.Snapshot,
 		Panic:    c.Panic,
 		Error:    errMsg,
 		Children: ((stacks)(c.Children)).Export(opts),

cmd/xgo/runtime_gen/trace/stack_export.go

@@ -25,8 +25,12 @@ type StackExport struct {
 
 	Args    interface{}
 	Results interface{}
-	Panic   bool
-	Error   string
+
+	// is recorded as snapshot
+	Snapshot bool
+
+	Panic bool
+	Error string
 
 	Children []*StackExport
 }

cmd/xgo/runtime_gen/trace/trace.go

@@ -155,12 +155,14 @@ type CollectOptions struct {
 }
 
 type collectOpts struct {
-	name          string
-	onComplete    func(root *Root)
-	filter        []func(stack *Stack) bool
-	root          *Root
-	options       *CollectOptions
-	exportOptions *ExportOptions
+	name            string
+	onComplete      func(root *Root)
+	filters         []func(stack *Stack) bool
+	postFilters     []func(stack *Stack)
+	snapshotFilters []func(stack *Stack) bool
+	root            *Root
+	options         *CollectOptions
+	exportOptions   *ExportOptions
 }
 
 func Options() *collectOpts {
@@ -178,7 +180,17 @@ func (c *collectOpts) OnComplete(f func(root *Root)) *collectOpts {
 }
 
 func (c *collectOpts) WithFilter(f func(stack *Stack) bool) *collectOpts {
-	c.filter = append(c.filter, f)
+	c.filters = append(c.filters, f)
+	return c
+}
+
+func (c *collectOpts) WithPostFilter(f func(stack *Stack)) *collectOpts {
+	c.postFilters = append(c.postFilters, f)
+	return c
+}
+
+func (c *collectOpts) WithSnapshot(f func(stack *Stack) bool) *collectOpts {
+	c.snapshotFilters = append(c.snapshotFilters, f)
 	return c
 }
 
@@ -256,10 +268,22 @@ func handleTracePre(ctx context.Context, f *core.FuncInfo, args core.Object, res
 			initial = true
 		}
 	} else {
-		if !checkFilter(stack, localOpts.filter) {
+		if !checkFilters(stack, localOpts.filters) {
 			// do not collect trace if filtered out
 			return nil, trap.ErrSkip
 		}
+		var anySnapshot bool
+		for _, f := range localOpts.snapshotFilters {
+			if f(stack) {
+				anySnapshot = true
+				break
+			}
+		}
+		if anySnapshot {
+			stack.Snapshot = true
+			stack.Args = premarshal(stack.Args)
+		}
+
 		localRoot = localOpts.root
 		if localRoot == nil {
 			initial = true
@@ -305,7 +329,7 @@ func handleTracePre(ctx context.Context, f *core.FuncInfo, args core.Object, res
 	return prevTop, nil
 }
 
-func checkFilter(stack *Stack, filters []func(stack *Stack) bool) bool {
+func checkFilters(stack *Stack, filters []func(stack *Stack) bool) bool {
 	for _, f := range filters {
 		if !f(stack) {
 			return false
@@ -333,13 +357,19 @@ func handleTracePost(ctx context.Context, f *core.FuncInfo, args core.Object, re
 			panic(fmt.Errorf("unbalanced stack"))
 		}
 		root = localOpts.root
+		for _, f := range localOpts.postFilters {
+			f(root.Top)
+		}
 	} else {
 		v, ok := stackMap.Load(key)
 		if !ok {
 			panic(fmt.Errorf("unbalanced stack"))
 		}
 		root = v.(*Root)
 	}
+	if root.Top != nil && root.Top.Snapshot {
+		root.Top.Results = premarshal(root.Top.Results)
+	}
 
 	// detect panic
 	pe := __xgo_link_peek_panic()
@@ -543,3 +573,34 @@ func emitTrace(name string, root *Root, opts *ExportOptions) error {
 	})
 	return err
 }
+
+func premarshal(v core.Object) (res core.Object) {
+	var err error
+	var data []byte
+	defer func() {
+		if e := recover(); e != nil {
+			if pe, ok := e.(error); ok {
+				err = pe
+			} else {
+				err = fmt.Errorf("marshal %T: %v", v, e)
+			}
+		}
+		if err != nil {
+			data = []byte(`{"err":` + strconv.Quote(err.Error()) + ` }`)
+		}
+		res = &premarshaled{Object: v, data: data}
+	}()
+	data, err = MarshalAnyJSON(v)
+	return
+}
+
+type premarshaled struct {
+	core.Object
+	data []byte
+}
+
+var _ core.Object = (*premarshaled)(nil)
+
+func (c *premarshaled) MarshalJSON() ([]byte, error) {
+	return c.data, nil
+}

cmd/xgo/version.go

@@ -4,8 +4,8 @@ import "fmt"
 
 // auto updated
 const VERSION = "1.0.46"
-const REVISION = "baec4d50e4c26d279fe32cd30c7649d707b8f1ce+1"
-const NUMBER = 299
+const REVISION = "ddb79e33f33b43c8eb97936e31212bc2f54ac3c1+1"
+const NUMBER = 300
 
 // manually updated
 const CORE_VERSION = "1.0.43"

runtime/test/go.mod

@@ -2,8 +2,8 @@ module github.com/xhd2015/xgo/runtime/test
 
 go 1.18
 
-require (
-	github.com/xhd2015/xgo/runtime v1.0.16
-)
+require github.com/xhd2015/xgo/runtime v1.0.16
+
+require github.com/xhd2015/xgo v1.0.47-0.20240726085913-ddb79e33f33b
 
 replace github.com/xhd2015/xgo/runtime => ../

runtime/test/go.sum

@@ -0,0 +1,2 @@
+github.com/xhd2015/xgo v1.0.47-0.20240726085913-ddb79e33f33b h1:D0+4qUvmlcG2QTi6RU7xBnzemRrLyM7QYnYVd4jhR+g=
+github.com/xhd2015/xgo v1.0.47-0.20240726085913-ddb79e33f33b/go.mod h1:LJxlcYSaXo/9YpsnB3yHh9NHe7BRettYCytaNGWY2BE=

runtime/test/trace/snapshot/snapshot.go

@@ -0,0 +1,37 @@
+package snapshot
+
+type _InOut struct {
+	Last  string
+	Count int
+}
+
+type _Response struct {
+	Last  string
+	Count int
+}
+
+func handleL1() *_Response {
+	_, resp := handleL2()
+	resp.Last = "handleL1"
+	resp.Count++
+	return resp
+}
+
+func handleL2() (*_InOut, *_Response) {
+	a := &_InOut{
+		Last: "handleL2",
+	}
+	resp := handleL3(a)
+
+	resp.Last = "handleL2"
+	resp.Count++
+	return a, resp
+}
+
+func handleL3(a *_InOut) *_Response {
+	a.Last = "handleL3"
+	a.Count++
+	return &_Response{
+		Last: "handleL3",
+	}
+}