From 8039701f9ef8bbab42ceb9f4894c666cd320f123 Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <kubuxu@protocol.ai>
Date: Mon, 15 Jun 2020 19:50:43 +0200
Subject: [PATCH] Use extra field in gastrace

Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
---
 chain/types/execresult.go |  2 +-
 chain/vm/gas.go           | 10 +++++++++-
 chain/vm/gas_v0.go        |  6 +++---
 chain/vm/runtime.go       | 14 +++++++++-----
 cli/state.go              |  2 +-
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/chain/types/execresult.go b/chain/types/execresult.go
index b0e1f760d..443147f9e 100644
--- a/chain/types/execresult.go
+++ b/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:"-"`
 }
diff --git a/chain/vm/gas.go b/chain/vm/gas.go
index dc9966e57..2540afbf0 100644
--- a/chain/vm/gas.go
+++ b/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,
diff --git a/chain/vm/gas_v0.go b/chain/vm/gas_v0.go
index c631beaee..e2a908a23 100644
--- a/chain/vm/gas_v0.go
+++ b/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
diff --git a/chain/vm/runtime.go b/chain/vm/runtime.go
index 9b83593ab..48563df64 100644
--- a/chain/vm/runtime.go
+++ b/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
diff --git a/cli/state.go b/cli/state.go
index 753b0b017..1aad85299 100644
--- a/cli/state.go
+++ b/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>