Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove heap allocations when flushing the nodes or cached leaves #196

Merged
merged 1 commit into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
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
14 changes: 14 additions & 0 deletions blockchain/internal/utreexobackends/cachedleavesmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,20 @@ func (ms *CachedLeavesMapSlice) DeleteMaps() {
}
}

// ClearMaps clears all maps
//
// This function is safe for concurrent access.
func (ms *CachedLeavesMapSlice) ClearMaps() {
ms.mtx.Lock()
defer ms.mtx.Unlock()

for i := range ms.maps {
for key := range ms.maps[i] {
delete(ms.maps[i], key)
}
}
}

// ForEach loops through all the elements in the cachedleaves map slice and calls fn with the key-value pairs.
//
// This function is safe for concurrent access.
Expand Down
14 changes: 14 additions & 0 deletions blockchain/internal/utreexobackends/nodesmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,20 @@ func (ms *NodesMapSlice) DeleteMaps() {
}
}

// ClearMaps clears all maps
//
// This function is safe for concurrent access.
func (ms *NodesMapSlice) ClearMaps() {
ms.mtx.Lock()
defer ms.mtx.Unlock()

for i := range ms.maps {
for key := range ms.maps[i] {
delete(ms.maps[i], key)
}
}
}

// ForEach loops through all the elements in the nodes map slice and calls fn with the key-value pairs.
//
// This function is safe for concurrent access.
Expand Down
28 changes: 14 additions & 14 deletions blockchain/utreexoio.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import (
// leafLength is the length of a seriailzed leaf.
const leafLength = chainhash.HashSize + 1

// buffer size for VLQ serialization. Double the size needed to serialize 2^64
const vlqBufSize = 22

// serializeLeaf serializes the leaf to [leafLength]byte.
func serializeLeaf(leaf utreexo.Leaf) [leafLength]byte {
var buf [leafLength]byte
Expand Down Expand Up @@ -68,12 +71,11 @@ func InitNodesBackEnd(datadir string, maxTotalMemoryUsage int64) (*NodesBackEnd,

// dbPut serializes and puts the key value pair into the database.
func (m *NodesBackEnd) dbPut(k uint64, v utreexo.Leaf) error {
size := serializeSizeVLQ(k)
buf := make([]byte, size)
putVLQ(buf, k)
var buf [vlqBufSize]byte
size := putVLQ(buf[:], k)

serialized := serializeLeaf(v)
return m.db.Put(buf[:], serialized[:], nil)
return m.db.Put(buf[:size], serialized[:], nil)
}

// dbGet fetches the value from the database and deserializes it and returns
Expand All @@ -98,10 +100,9 @@ func (m *NodesBackEnd) dbGet(k uint64) (utreexo.Leaf, bool) {

// dbDel removes the key from the database.
func (m *NodesBackEnd) dbDel(k uint64) error {
size := serializeSizeVLQ(k)
buf := make([]byte, size)
putVLQ(buf, k)
return m.db.Delete(buf, nil)
var buf [vlqBufSize]byte
size := putVLQ(buf[:], k)
return m.db.Delete(buf[:size], nil)
}

// Get returns the leaf from the underlying map.
Expand Down Expand Up @@ -276,7 +277,7 @@ func (m *NodesBackEnd) flush() {
}
})

m.cache.DeleteMaps()
m.cache.ClearMaps()
}

// Close flushes the cache and closes the underlying database.
Expand All @@ -298,10 +299,9 @@ type CachedLeavesBackEnd struct {

// dbPut serializes and puts the key and the value into the database.
func (m *CachedLeavesBackEnd) dbPut(k utreexo.Hash, v uint64) error {
size := serializeSizeVLQ(v)
buf := make([]byte, size)
putVLQ(buf, v)
return m.db.Put(k[:], buf, nil)
var buf [vlqBufSize]byte
size := putVLQ(buf[:], v)
return m.db.Put(k[:], buf[:size], nil)
}

// dbGet fetches and deserializes the value from the database.
Expand Down Expand Up @@ -411,7 +411,7 @@ func (m *CachedLeavesBackEnd) flush() {
}
})

m.cache.DeleteMaps()
m.cache.ClearMaps()
}

// Close flushes all the cached entries and then closes the underlying database.
Expand Down
Loading