Merge pull request #2137 from filecoin-project/feat/compact-trace

Make gas traces smaller, strip callers in import-bench

chain/types/execresult.go

@@ -21,16 +21,16 @@ type ExecutionTrace struct {
 type GasTrace struct {
 	Name string
 
-	Location          []Loc
+	Location          []Loc `json:"loc"`
-	TotalGas          int64
+	TotalGas          int64 `json:"tg"`
-	ComputeGas        int64
+	ComputeGas        int64 `json:"cg"`
-	StorageGas        int64
+	StorageGas        int64 `json:"sg"`
-	TotalVirtualGas   int64
+	TotalVirtualGas   int64 `json:"vtg"`
-	VirtualComputeGas int64
+	VirtualComputeGas int64 `json:"vcg"`
-	VirtualStorageGas int64
+	VirtualStorageGas int64 `json:"vsg"`
 
-	TimeTaken time.Duration
+	TimeTaken time.Duration `json:"tt"`
-	Extra     interface{} `json:",omitempty"`
+	Extra     interface{}   `json:"ex,omitempty"`
 
 	Callers []uintptr `json:"-"`
 }

chain/vm/runtime.go

@@ -408,7 +408,7 @@ func (rt *Runtime) internalSend(from, to address.Address, method abi.MethodNum,
 	if subrt != nil {
 		rt.numActorsCreated = subrt.numActorsCreated
 	}
-	rt.executionTrace.Subcalls = append(rt.executionTrace.Subcalls, subrt.executionTrace) //&er)
+	rt.executionTrace.Subcalls = append(rt.executionTrace.Subcalls, subrt.executionTrace)
 	return ret, errSend
 }
 

cmd/lotus-bench/import.go

@@ -149,6 +149,7 @@ var importBenchCmd = &cli.Command{
 			if err != nil {
 				return err
 			}
+			stripCallers(trace)
 
 			lastTse = &TipSetExec{
 				TipSet:   cur.Key(),
@@ -168,6 +169,21 @@ var importBenchCmd = &cli.Command{
 	},
 }
 
+func walkExecutionTrace(et *types.ExecutionTrace) {
+	for _, gc := range et.GasCharges {
+		gc.Callers = nil
+	}
+	for _, sub := range et.Subcalls {
+		walkExecutionTrace(&sub) //nolint:scopelint,gosec
+	}
+}
+
+func stripCallers(trace []*api.InvocResult) {
+	for _, t := range trace {
+		walkExecutionTrace(&t.ExecutionTrace)
+	}
+}
+
 type Invocation struct {
 	TipSet types.TipSetKey
 	Invoc  *api.InvocResult