Expose more callers, ellipsis unimportant ones

Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>

chain/types/execresult.go

@@ -19,36 +19,84 @@ type ExecutionTrace struct {
 }
 
 type GasTrace struct {
-	Name       string
-	Location   string
+	Name string
+
+	Location   []Loc
 	TotalGas   int64
 	ComputeGas int64
 	StorageGas int64
 
 	TimeTaken time.Duration
+	Extra     interface{}
 
 	Callers []uintptr `json:"-"`
 }
 
+type Loc struct {
+	File     string
+	Line     int
+	Function string
+}
+
+func (l Loc) Show() bool {
+	ignorePrefix := []string{
+		"reflect.",
+		"github.com/filecoin-project/lotus/chain/vm.(*Invoker).transform",
+		"github.com/filecoin-project/go-amt-ipld/",
+	}
+	for _, pre := range ignorePrefix {
+		if strings.HasPrefix(l.Function, pre) {
+			return false
+		}
+	}
+	return true
+}
+func (l Loc) String() string {
+	file := strings.Split(l.File, "/")
+
+	fn := strings.Split(l.Function, "/")
+	var fnpkg string
+	if len(fn) > 2 {
+		fnpkg = strings.Join(fn[len(fn)-2:], "/")
+	} else {
+		fnpkg = l.Function
+	}
+
+	return fmt.Sprintf("%s@%s:%d", fnpkg, file[len(file)-1], l.Line)
+}
+
+func (l Loc) Important() bool {
+	if strings.HasPrefix(l.Function, "github.com/filecoin-project/specs-actors/actors/builtin") {
+		return true
+	}
+	return false
+}
+
 func (gt *GasTrace) MarshalJSON() ([]byte, error) {
 	type GasTraceCopy GasTrace
-	if gt.Location == "" {
+	if len(gt.Location) == 0 {
 		if len(gt.Callers) != 0 {
 			frames := runtime.CallersFrames(gt.Callers)
 			for {
 				frame, more := frames.Next()
-				fn := strings.Split(frame.Function, "/")
+				if frame.Function == "github.com/filecoin-project/lotus/chain/vm.(*VM).ApplyMessage" {
+					break
+				}
+				l := Loc{
+					File:     frame.File,
+					Line:     frame.Line,
+					Function: frame.Function,
+				}
+				//fn := strings.Split(frame.Function, "/")
 
-				split := strings.Split(frame.File, "/")
-				file := strings.Join(split[len(split)-2:], "/")
-				gt.Location += fmt.Sprintf("%s@%s:%d", fn[len(fn)-1], file, frame.Line)
+				//split := strings.Split(frame.File, "/")
+				//file := strings.Join(split[len(split)-2:], "/")
+				//gt.Location += fmt.Sprintf("%s@%s:%d", fn[len(fn)-1], file, frame.Line)
+				gt.Location = append(gt.Location, l)
 				if !more {
 					break
 				}
-				gt.Location += "|"
 			}
-		} else {
-			gt.Location = "n/a"
 		}
 	}
 

chain/vm/runtime.go

@@ -488,22 +488,33 @@ func (rt *Runtime) stateCommit(oldh, newh cid.Cid) aerrors.ActorError {
 	return nil
 }
 
-func (rt *Runtime) ChargeGas(gas GasCharge) {
-	err := rt.chargeGasInternal(gas)
-	if err != nil {
-		panic(err)
-	}
-}
 func (rt *Runtime) finilizeGasTracing() {
 	if rt.lastGasCharge != nil {
 		rt.lastGasCharge.TimeTaken = time.Since(rt.lastGasChargeTime)
 	}
 }
 
-func (rt *Runtime) chargeGasInternal(gas GasCharge) aerrors.ActorError {
+func (rt *Runtime) ChargeGas(gas GasCharge) {
+	err := rt.chargeGasInternal(gas, 1)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func (rt *Runtime) chargeGasFunc(skip int) func(GasCharge) {
+	return func(gas GasCharge) {
+		err := rt.chargeGasInternal(gas, 1+skip)
+		if err != nil {
+			panic(err)
+		}
+	}
+
+}
+
+func (rt *Runtime) chargeGasInternal(gas GasCharge, skip int) aerrors.ActorError {
 	toUse := gas.Total()
-	var callers [3]uintptr
-	cout := gruntime.Callers(3, callers[:])
+	var callers [10]uintptr
+	cout := gruntime.Callers(2+skip, callers[:])
 
 	now := time.Now()
 	if rt.lastGasCharge != nil {
@@ -530,7 +541,7 @@ func (rt *Runtime) chargeGasInternal(gas GasCharge) aerrors.ActorError {
 }
 
 func (rt *Runtime) chargeGasSafe(gas GasCharge) aerrors.ActorError {
-	return rt.chargeGasInternal(gas)
+	return rt.chargeGasInternal(gas, 1)
 }
 
 func (rt *Runtime) Pricelist() Pricelist {

chain/vm/vm.go

@@ -107,12 +107,12 @@ func (vm *VM) makeRuntime(ctx context.Context, msg *types.Message, origin addres
 	}
 
 	rt.cst = &cbor.BasicIpldStore{
-		Blocks: &gasChargingBlocks{rt.ChargeGas, rt.pricelist, vm.cst.Blocks},
+		Blocks: &gasChargingBlocks{rt.chargeGasFunc(2), rt.pricelist, vm.cst.Blocks},
 		Atlas:  vm.cst.Atlas,
 	}
 	rt.sys = pricedSyscalls{
 		under:     vm.Syscalls,
-		chargeGas: rt.ChargeGas,
+		chargeGas: rt.chargeGasFunc(1),
 		pl:        rt.pricelist,
 	}
 

cli/state.go

@@ -972,9 +972,35 @@ var compStateTemplate = `
    .slow-true-true { color: #f80; }
    table {
     font-size: 12px;
-	border-collapse: collapse;
-	}
-	tr.sum { border-top: 1px solid black; }
+    border-collapse: collapse;
+   }
+   tr { 
+   	border-top: 1px solid black;
+   	border-bottom: 1px solid black;
+   }
+   tr.sum { border-top: 2px solid black; }
+   tr:first-child { border-top: none; }
+   tr:last-child { border-bottom: none; }
+
+
+   .ellipsis-content,
+   .ellipsis-toggle input {
+     display: none;
+   }
+   .ellipsis-toggle {
+     cursor: pointer;
+   }
+   /**
+   Checked State
+   **/
+   
+   .ellipsis-toggle input:checked + .ellipsis {
+     display: none;
+   }
+   .ellipsis-toggle input:checked ~ .ellipsis-content {
+     display: inline;
+	 background-color: #ddd;
+   }
   </style>
  </head>
  <body>
@@ -1028,7 +1054,21 @@ var compStateMsg = `
   <table>
    <tr><th>Name</th><th>Total/Compute/Storage</th><th>Time Taken</th><th>Location</th></tr>
    {{range .GasCharges}}
-    <tr><td>{{.Name}}</td><td>{{.TotalGas}}/{{.ComputeGas}}/{{.StorageGas}}</td><td>{{.TimeTaken}}</td><td>{{.Location}}</td></tr>
+    <tr><td>{{.Name}}</td><td>{{.TotalGas}}/{{.ComputeGas}}/{{.StorageGas}}</td><td>{{.TimeTaken}}</td>
+	<td>
+	{{ range $index, $ele := .Location }}
+	 {{- if $index }}|&#8203;{{end -}}
+	 {{- if .Show -}}
+	 {{- if .Important }}<b>{{end -}}
+	 {{- . -}}
+	 {{- if .Important }}</b>{{end -}}
+     {{- else -}}
+     <label class="ellipsis-toggle"><input type="checkbox" /><span class="ellipsis">...</span>
+	 {{- "" -}}
+	 <span class="ellipsis-content">{{- . -}}</span></label>
+	 {{- end -}}
+	{{end}}
+	</td></tr>
    {{end}}
    {{with SumGas .GasCharges}}
      <tr class="sum"><td><b>Sum</b></td><td>{{.TotalGas}}/{{.ComputeGas}}/{{.StorageGas}}</td><td>{{.TimeTaken}}</td><td></td></tr>