TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2025-04-24 01:40:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

vm: optimize script loading a bit

Browse source 
Preseed the scriptHash value when we already know it. Eliminates this time
waste from the pprof graph, but doesn't really change anything in the 1.4M ->
1.5M 100K mainnet blocks import test.
This commit is contained in:
Roman Khimov 2019-12-23 18:02:39 +03:00
parent a939c97a25
commit cc16dac0b4
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/vm/vm.go
View file

@ -238,6 +238,14 @@ func (v *VM) LoadScript(b []byte) {
v.istack.PushVal(ctx) v.istack.PushVal(ctx)
} }
// loadScriptWithHash if similar to the LoadScript method, but it also loads
// given script hash directly into the Context to avoid its recalculations. It's
// up to user of this function to make sure the script and hash match each other.
func (v *VM) loadScriptWithHash(b []byte, hash util.Uint160) {
v.LoadScript(b)
v.istack.Top().Value().(*Context).scriptHash = hash
}
// Context returns the current executed context. Nil if there is no context, // Context returns the current executed context. Nil if there is no context,
// which implies no program is loaded. // which implies no program is loaded.
func (v *VM) Context() *Context { func (v *VM) Context() *Context {
@ -1120,7 +1128,7 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
_ = v.istack.Pop() _ = v.istack.Pop()
} }
v.LoadScript(script) v.loadScriptWithHash(script, hash)
case opcode.RET: case opcode.RET:
oldCtx := v.istack.Pop().Value().(*Context) oldCtx := v.istack.Pop().Value().(*Context)
@ -1336,6 +1344,7 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
panic(fmt.Sprintf("could not find script %s", hash)) panic(fmt.Sprintf("could not find script %s", hash))
} }
newCtx = NewContext(script) newCtx = NewContext(script)
newCtx.scriptHash = hash
} }
newCtx.rvcount = rvcount newCtx.rvcount = rvcount
newCtx.estack = NewStack("evaluation") newCtx.estack = NewStack("evaluation")