aboutsummaryrefslogtreecommitdiffstats
path: root/core/vm
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2016-10-31 19:07:43 +0800
committerGitHub <noreply@github.com>2016-10-31 19:07:43 +0800
commit4dc1fb923ab77fe564bdda25f36744dffa235045 (patch)
treece6de64598f42416dbffc1dff24904429f92031c /core/vm
parentb8dec948d4d7d8257e63aeecf982c25aeec9a180 (diff)
parentbb6115b737a05e3b8bf70ff2ad74c703589627cb (diff)
downloaddexon-4dc1fb923ab77fe564bdda25f36744dffa235045.tar
dexon-4dc1fb923ab77fe564bdda25f36744dffa235045.tar.gz
dexon-4dc1fb923ab77fe564bdda25f36744dffa235045.tar.bz2
dexon-4dc1fb923ab77fe564bdda25f36744dffa235045.tar.lz
dexon-4dc1fb923ab77fe564bdda25f36744dffa235045.tar.xz
dexon-4dc1fb923ab77fe564bdda25f36744dffa235045.tar.zst
dexon-4dc1fb923ab77fe564bdda25f36744dffa235045.zip
Merge pull request #3064 from pirapira/limit_struct_logs
core/vm: add limit option to LogConfig
Diffstat (limited to 'core/vm')
-rw-r--r--core/vm/errors.go1
-rw-r--r--core/vm/logger.go11
-rw-r--r--core/vm/vm.go5
3 files changed, 14 insertions, 3 deletions
diff --git a/core/vm/errors.go b/core/vm/errors.go
index 116fbe456..1766bf9fb 100644
--- a/core/vm/errors.go
+++ b/core/vm/errors.go
@@ -26,3 +26,4 @@ import (
var OutOfGasError = errors.New("Out of gas")
var CodeStoreOutOfGasError = errors.New("Contract creation code storage out of gas")
var DepthError = fmt.Errorf("Max call depth exceeded (%d)", params.CallCreateDepth)
+var TraceLimitReachedError = errors.New("The number of logs reached the specified limit")
diff --git a/core/vm/logger.go b/core/vm/logger.go
index ae62b6b57..9e13d703b 100644
--- a/core/vm/logger.go
+++ b/core/vm/logger.go
@@ -42,6 +42,7 @@ type LogConfig struct {
DisableStack bool // disable stack capture
DisableStorage bool // disable storage capture
FullStorage bool // show full storage (slow)
+ Limit int // maximum length of output, but zero means unlimited
}
// StructLog is emitted to the Environment each cycle and lists information about the current internal state
@@ -64,7 +65,7 @@ type StructLog struct {
// Note that reference types are actual VM data structures; make copies
// if you need to retain them beyond the current call.
type Tracer interface {
- CaptureState(env Environment, pc uint64, op OpCode, gas, cost *big.Int, memory *Memory, stack *Stack, contract *Contract, depth int, err error)
+ CaptureState(env Environment, pc uint64, op OpCode, gas, cost *big.Int, memory *Memory, stack *Stack, contract *Contract, depth int, err error) error
}
// StructLogger is an EVM state logger and implements Tracer.
@@ -93,7 +94,12 @@ func NewStructLogger(cfg *LogConfig) *StructLogger {
// captureState logs a new structured log message and pushes it out to the environment
//
// captureState also tracks SSTORE ops to track dirty values.
-func (l *StructLogger) CaptureState(env Environment, pc uint64, op OpCode, gas, cost *big.Int, memory *Memory, stack *Stack, contract *Contract, depth int, err error) {
+func (l *StructLogger) CaptureState(env Environment, pc uint64, op OpCode, gas, cost *big.Int, memory *Memory, stack *Stack, contract *Contract, depth int, err error) error {
+ // check if already accumulated the specified number of logs
+ if l.cfg.Limit != 0 && l.cfg.Limit <= len(l.logs) {
+ return TraceLimitReachedError
+ }
+
// initialise new changed values storage container for this contract
// if not present.
if l.changedValues[contract.Address()] == nil {
@@ -152,6 +158,7 @@ func (l *StructLogger) CaptureState(env Environment, pc uint64, op OpCode, gas,
log := StructLog{pc, op, new(big.Int).Set(gas), cost, mem, stck, storage, env.Depth(), err}
l.logs = append(l.logs, log)
+ return nil
}
// StructLogs returns a list of captured log entries
diff --git a/core/vm/vm.go b/core/vm/vm.go
index 205934822..09cddc2f8 100644
--- a/core/vm/vm.go
+++ b/core/vm/vm.go
@@ -188,7 +188,10 @@ func (evm *EVM) Run(contract *Contract, input []byte) (ret []byte, err error) {
mem.Resize(newMemSize.Uint64())
// Add a log message
if evm.cfg.Debug {
- evm.cfg.Tracer.CaptureState(evm.env, pc, op, contract.Gas, cost, mem, stack, contract, evm.env.Depth(), nil)
+ err = evm.cfg.Tracer.CaptureState(evm.env, pc, op, contract.Gas, cost, mem, stack, contract, evm.env.Depth(), nil)
+ if err != nil {
+ return nil, err
+ }
}
if opPtr := evm.jumpTable[op]; opPtr.valid {