Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions skl/arena.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ const (

// Arena should be lock-free.
type Arena struct {
n uint32
buf []byte
n uint32
valN uint32 // Value is allocate from the end.
buf []byte
}

// newArena returns a new arena.
Expand All @@ -51,11 +52,12 @@ func newArena(n int64) *Arena {
}

func (s *Arena) size() int64 {
return int64(atomic.LoadUint32(&s.n))
return int64(atomic.LoadUint32(&s.n) + atomic.LoadUint32(&s.valN))
}

func (s *Arena) reset() {
atomic.StoreUint32(&s.n, 0)
atomic.StoreUint32(&s.valN, 0)
}

// putNode allocates a node in the arena. The node is aligned on a pointer-sized
Expand All @@ -81,11 +83,9 @@ func (s *Arena) putNode(height int) uint32 {
// decoding will incur some overhead.
func (s *Arena) putVal(v y.ValueStruct) uint32 {
l := uint32(v.EncodedSize())
n := atomic.AddUint32(&s.n, l)
y.Assert(int(n) <= len(s.buf))
m := n - l
v.Encode(s.buf[m:])
return m
valOff := uint32(len(s.buf)) - atomic.AddUint32(&s.valN, l)
v.Encode(s.buf[valOff:])
return valOff
}

func (s *Arena) putKey(key []byte) uint32 {
Expand Down