diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-04-04 17:15:23 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-04-04 17:15:23 +0800 |
| commit | 52dc7cb452b5d717f825c259cd1b2dae9d5d70d8 (patch) | |
| tree | e869320e4e37e7e06855970e4cc37721920865f6 /miner | |
| parent | f6f7e7a8705294dae03d44dd4b1ea183b8d314b3 (diff) | |
| parent | bbeaab7e64f50fb303008b065894f58d7563c7ad (diff) | |
| download | dexon-52dc7cb452b5d717f825c259cd1b2dae9d5d70d8.tar dexon-52dc7cb452b5d717f825c259cd1b2dae9d5d70d8.tar.gz dexon-52dc7cb452b5d717f825c259cd1b2dae9d5d70d8.tar.bz2 dexon-52dc7cb452b5d717f825c259cd1b2dae9d5d70d8.tar.lz dexon-52dc7cb452b5d717f825c259cd1b2dae9d5d70d8.tar.xz dexon-52dc7cb452b5d717f825c259cd1b2dae9d5d70d8.tar.zst dexon-52dc7cb452b5d717f825c259cd1b2dae9d5d70d8.zip | |
Merge pull request #2378 from obscuren/enable-jit-a-b
cmd/utils, miner: A/B testing JIT VM. Disabled for miners
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go index c45945b87..a5e2516fe 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -662,7 +662,15 @@ func (env *Work) commitTransactions(mux *event.TypeMux, transactions types.Trans func (env *Work) commitTransaction(tx *types.Transaction, bc *core.BlockChain, gp *core.GasPool) (error, vm.Logs) { snap := env.state.Copy() - receipt, logs, _, err := core.ApplyTransaction(env.config, bc, gp, env.state, env.header, tx, env.header.GasUsed, env.config.VmConfig) + + // this is a bit of a hack to force jit for the miners + config := env.config.VmConfig + if !(config.EnableJit && config.ForceJit) { + config.EnableJit = false + } + config.ForceJit = false // disable forcing jit + + receipt, logs, _, err := core.ApplyTransaction(env.config, bc, gp, env.state, env.header, tx, env.header.GasUsed, config) if err != nil { env.state.Set(snap) return err, nil |