Merge pull request #2026 from filecoin-project/feat/gas-extra

Use extra field in gastrace

chain/types/execresult.go

@@ -30,7 +30,7 @@ type GasTrace struct {
 	VirtualStorageGas int64
 
 	TimeTaken time.Duration
-	Extra     interface{}
+	Extra     interface{} `json:",omitempty"`
 
 	Callers []uintptr `json:"-"`
 }

chain/vm/gas.go

@@ -18,7 +18,9 @@ const (
 )
 
 type GasCharge struct {
-	Name       string
+	Name  string
+	Extra interface{}
+
 	ComputeGas int64
 	StorageGas int64
 
@@ -36,6 +38,12 @@ func (g GasCharge) WithVirtual(compute, storage int64) GasCharge {
 	return out
 }
 
+func (g GasCharge) WithExtra(extra interface{}) GasCharge {
+	out := g
+	out.Extra = extra
+	return out
+}
+
 func newGasCharge(name string, computeGas int64, storageGas int64) GasCharge {
 	return GasCharge{
 		Name:       name,

chain/vm/gas_v0.go

@@ -108,12 +108,12 @@ func (pl *pricelistV0) OnMethodInvocation(value abi.TokenAmount, methodNum abi.M
 
 // OnIpldGet returns the gas used for storing an object
 func (pl *pricelistV0) OnIpldGet(dataSize int) GasCharge {
-	return newGasCharge(fmt.Sprintf("OnIpldGet:%db", dataSize), pl.ipldGetBase+int64(dataSize)*pl.ipldGetPerByte, 0)
+	return newGasCharge("OnIpldGet", pl.ipldGetBase+int64(dataSize)*pl.ipldGetPerByte, 0).WithExtra(dataSize)
 }
 
 // OnIpldPut returns the gas used for storing an object
 func (pl *pricelistV0) OnIpldPut(dataSize int) GasCharge {
-	return newGasCharge(fmt.Sprintf("OnIpldPut:%db", dataSize), pl.ipldPutBase, int64(dataSize)*pl.ipldPutPerByte)
+	return newGasCharge("OnIpldPut", pl.ipldPutBase, int64(dataSize)*pl.ipldPutPerByte).WithExtra(dataSize)
 }
 
 // OnCreateActor returns the gas used for creating an actor
@@ -133,7 +133,7 @@ func (pl *pricelistV0) OnVerifySignature(sigType crypto.SigType, planTextSize in
 		return GasCharge{}, fmt.Errorf("cost function for signature type %d not supported", sigType)
 	}
 	sigName, _ := sigType.Name()
-	return newGasCharge("OnVerifySignature/"+sigName, costFn(int64(planTextSize)), 0), nil
+	return newGasCharge("OnVerifySignature", costFn(int64(planTextSize)), 0).WithExtra(sigName), nil
 }
 
 // OnHashing

chain/vm/runtime.go

@@ -524,14 +524,18 @@ func (rt *Runtime) chargeGasInternal(gas GasCharge, skip int) aerrors.ActorError
 	}
 
 	gasTrace := types.GasTrace{
-		Name:              gas.Name,
-		TotalGas:          toUse,
-		ComputeGas:        gas.ComputeGas,
-		StorageGas:        gas.StorageGas,
+		Name:  gas.Name,
+		Extra: gas.Extra,
+
+		TotalGas:   toUse,
+		ComputeGas: gas.ComputeGas,
+		StorageGas: gas.StorageGas,
+
 		TotalVirtualGas:   gas.VirtualCompute*GasComputeMulti + gas.VirtualStorage*GasStorageMulti,
 		VirtualComputeGas: gas.VirtualCompute,
 		VirtualStorageGas: gas.VirtualStorage,
-		Callers:           callers[:cout],
+
+		Callers: callers[:cout],
 	}
 	rt.executionTrace.GasCharges = append(rt.executionTrace.GasCharges, &gasTrace)
 	rt.lastGasChargeTime = now

cli/state.go

@@ -1072,7 +1072,7 @@ var compStateMsg = `
  {{- end}}
 
  {{range .GasCharges}}
- <tr><td>{{.Name}}</td>
+ <tr><td>{{.Name}}{{if .Extra}}:{{.Extra}}{{end}}</td>
  {{template "gasC" .}}
  <td>{{.TimeTaken}}</td>
   <td>