dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

Merge pull request #2659 from nspcc-dev/optimize-refcount

Browse source 
vm: optimize refcount
This commit is contained in:
Roman Khimov 2022-08-23 14:32:21 +03:00 committed by GitHub
commit 68e37628d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/vm/fuzz_test.go
View file

@ -16,6 +16,12 @@ var fuzzSeedValidScripts = [][]byte{
makeProgram(opcode.PUSH2, opcode.NEWARRAY, opcode.DUP, opcode.PUSH0, opcode.PUSH1, opcode.SETITEM, opcode.VALUES), makeProgram(opcode.PUSH2, opcode.NEWARRAY, opcode.DUP, opcode.PUSH0, opcode.PUSH1, opcode.SETITEM, opcode.VALUES),
append([]byte{byte(opcode.PUSHDATA1), 10}, randomBytes(10)...), append([]byte{byte(opcode.PUSHDATA1), 10}, randomBytes(10)...),
append([]byte{byte(opcode.PUSHDATA1), 100}, randomBytes(100)...), append([]byte{byte(opcode.PUSHDATA1), 100}, randomBytes(100)...),
// Simplified version of fuzzer output from #2659.
{byte(opcode.CALL), 3, byte(opcode.ASSERT),
byte(opcode.CALL), 3, byte(opcode.ASSERT),
byte(opcode.DEPTH), byte(opcode.PACKSTRUCT), byte(opcode.DUP),
byte(opcode.UNPACK), byte(opcode.PACKSTRUCT), byte(opcode.POPITEM),
byte(opcode.DEPTH)},
} }
func FuzzIsScriptCorrect(f *testing.F) { func FuzzIsScriptCorrect(f *testing.F) {

65
pkg/vm/ref_counter.go
View file

@ -7,15 +7,6 @@ import (
// refCounter represents a reference counter for the VM. // refCounter represents a reference counter for the VM.
type refCounter int type refCounter int
type (
rcInc interface {
IncRC() int
}
rcDec interface {
DecRC() int
}
)
func newRefCounter() *refCounter { func newRefCounter() *refCounter {
return new(refCounter) return new(refCounter)
} }
@ -27,20 +18,26 @@ func (r *refCounter) Add(item stackitem.Item) {
} }
*r++ *r++
irc, ok := item.(rcInc)
if !ok || irc.IncRC() > 1 {
return
}
switch t := item.(type) { switch t := item.(type) {
case *stackitem.Array, *stackitem.Struct: case *stackitem.Array:
for _, it := range item.Value().([]stackitem.Item) { if t.IncRC() == 1 {
r.Add(it) for _, it := range t.Value().([]stackitem.Item) {
r.Add(it)
}
}
case *stackitem.Struct:
if t.IncRC() == 1 {
for _, it := range t.Value().([]stackitem.Item) {
r.Add(it)
}
} }
case *stackitem.Map: case *stackitem.Map:
elems := t.Value().([]stackitem.MapElement) if t.IncRC() == 1 {
for i := range elems { elems := t.Value().([]stackitem.MapElement)
r.Add(elems[i].Key) for i := range elems {
r.Add(elems[i].Value) r.Add(elems[i].Key)
r.Add(elems[i].Value)
}
} }
} }
} }
@ -52,20 +49,26 @@ func (r *refCounter) Remove(item stackitem.Item) {
} }
*r-- *r--
irc, ok := item.(rcDec)
if !ok || irc.DecRC() > 0 {
return
}
switch t := item.(type) { switch t := item.(type) {
case *stackitem.Array, *stackitem.Struct: case *stackitem.Array:
for _, it := range item.Value().([]stackitem.Item) { if t.DecRC() == 0 {
r.Remove(it) for _, it := range t.Value().([]stackitem.Item) {
r.Remove(it)
}
}
case *stackitem.Struct:
if t.DecRC() == 0 {
for _, it := range t.Value().([]stackitem.Item) {
r.Remove(it)
}
} }
case *stackitem.Map: case *stackitem.Map:
elems := t.Value().([]stackitem.MapElement) if t.DecRC() == 0 {
for i := range elems { elems := t.Value().([]stackitem.MapElement)
r.Remove(elems[i].Key) for i := range elems {
r.Remove(elems[i].Value) r.Remove(elems[i].Key)
r.Remove(elems[i].Value)
}
} }
} }
} }

11
pkg/vm/ref_counter_test.go
View file

@ -55,3 +55,14 @@ func BenchmarkRefCounter_Add(b *testing.B) {
rc.Add(a) rc.Add(a)
} }
} }
func BenchmarkRefCounter_AddRemove(b *testing.B) {
a := stackitem.NewArray([]stackitem.Item{})
rc := newRefCounter()
b.ResetTimer()
for i := 0; i < b.N; i++ {
rc.Add(a)
rc.Remove(a)
}
}