Skip to content
This repository has been archived by the owner on Aug 19, 2022. It is now read-only.

improve interning #79

Merged
merged 2 commits into from
May 28, 2019
Merged

improve interning #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd3ea88
feat: improve protocol interning
Stebalien May 27, 2019
d2e2c56
feat: intern agent versions
Stebalien May 27, 2019
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
17 changes: 15 additions & 2 deletions pstoremem/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import (
pstore "github.com/libp2p/go-libp2p-peerstore"
)

var internKeys = map[string]bool{
"AgentVersion": true,
"ProtocolVersion": true,
}

type metakey struct {
id peer.ID
key string
Expand All @@ -15,8 +20,9 @@ type metakey struct {
type memoryPeerMetadata struct {
// store other data, like versions
//ds ds.ThreadSafeDatastore
ds map[metakey]interface{}
dslock sync.RWMutex
ds map[metakey]interface{}
dslock sync.RWMutex
interned map[string]interface{}
}

var _ pstore.PeerMetadata = (*memoryPeerMetadata)(nil)
Expand All @@ -30,6 +36,13 @@ func NewPeerMetadata() pstore.PeerMetadata {
func (ps *memoryPeerMetadata) Put(p peer.ID, key string, val interface{}) error {
ps.dslock.Lock()
defer ps.dslock.Unlock()
if vals, ok := val.(string); ok && internKeys[key] {
if interned, ok := ps.interned[vals]; ok {
val = interned
} else {
ps.interned[vals] = val
}
}
ps.ds[metakey{p, key}] = val
return nil
}
Expand Down
16 changes: 1 addition & 15 deletions pstoremem/protobook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ import (
pstore "github.com/libp2p/go-libp2p-peerstore"
)

const (
maxInternedProtocols = 512
maxInternedProtocolSize = 256
)

type protoSegment struct {
sync.RWMutex
protocols map[peer.ID]map[string]struct{}
Expand All @@ -35,7 +30,7 @@ var _ pstore.ProtoBook = (*memoryProtoBook)(nil)

func NewProtoBook() pstore.ProtoBook {
return &memoryProtoBook{
interned: make(map[string]string, maxInternedProtocols),
interned: make(map[string]string, 256),
segments: func() (ret protoSegments) {
for i := range ret {
ret[i] = &protoSegment{
Expand All @@ -48,10 +43,6 @@ func NewProtoBook() pstore.ProtoBook {
}

func (pb *memoryProtoBook) internProtocol(proto string) string {
if len(proto) > maxInternedProtocolSize {
return proto
}

// check if it is interned with the read lock
pb.lk.RLock()
interned, ok := pb.interned[proto]
Expand All @@ -71,11 +62,6 @@ func (pb *memoryProtoBook) internProtocol(proto string) string {
return interned
}

// if we've filled the table, throw it away and start over
if len(pb.interned) >= maxInternedProtocols {
pb.interned = make(map[string]string, maxInternedProtocols)
}

pb.interned[proto] = proto
return proto
}
Expand Down