Merge pull request #1626 from obscuren/defaults-fix

cmd/geth, core/vm: setup vm settings and defaulted JIT disabled
This commit is contained in:
Jeffrey Wilcke 2015-08-08 17:11:28 -07:00
commit 1cbd53add8
2 changed files with 4 additions and 3 deletions

View File

@ -336,6 +336,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
} }
app.Before = func(ctx *cli.Context) error { app.Before = func(ctx *cli.Context) error {
utils.SetupLogger(ctx) utils.SetupLogger(ctx)
utils.SetupVM(ctx)
if ctx.GlobalBool(utils.PProfEanbledFlag.Name) { if ctx.GlobalBool(utils.PProfEanbledFlag.Name) {
utils.StartPProf(ctx) utils.StartPProf(ctx)
} }

View File

@ -17,9 +17,9 @@
package vm package vm
var ( var (
DisableJit bool // Disable the JIT VM DisableJit bool = true // Disable the JIT VM
ForceJit bool // Force the JIT, skip byte VM ForceJit bool // Force the JIT, skip byte VM
MaxProgSize int // Max cache size for JIT Programs MaxProgSize int // Max cache size for JIT Programs
) )
const defaultJitMaxCache int = 64 const defaultJitMaxCache int = 64