-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #50 from libp2p/feat/283
Disassociate RT membership from connectivity
- Loading branch information
Showing
9 changed files
with
802 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| package kbucket | ||
|
|
||
| import ( | ||
| "sync" | ||
|
|
||
| "github.com/libp2p/go-libp2p-core/peer" | ||
| ) | ||
|
|
||
| // TODO Should ideally use a Circular queue for this | ||
| // maintains a bounded, de-duplicated and FIFO peer candidate queue for each Cpl | ||
| type cplReplacementCache struct { | ||
| localPeer ID | ||
| maxQueueSize int | ||
|
|
||
| sync.Mutex | ||
| candidates map[uint][]peer.ID // candidates for a Cpl | ||
| } | ||
|
|
||
| func newCplReplacementCache(localPeer ID, maxQueueSize int) *cplReplacementCache { | ||
| return &cplReplacementCache{ | ||
| localPeer: localPeer, | ||
| maxQueueSize: maxQueueSize, | ||
| candidates: make(map[uint][]peer.ID), | ||
| } | ||
| } | ||
|
|
||
| // pushes a candidate to the end of the queue for the corresponding Cpl | ||
| // returns false if the queue is full or it already has the peer | ||
| // returns true if was successfully added | ||
| func (c *cplReplacementCache) push(p peer.ID) bool { | ||
| c.Lock() | ||
| defer c.Unlock() | ||
|
|
||
| cpl := uint(CommonPrefixLen(c.localPeer, ConvertPeerID(p))) | ||
|
|
||
| // queue is full | ||
| if len(c.candidates[cpl]) >= c.maxQueueSize { | ||
| return false | ||
| } | ||
| // queue already has the peer | ||
| for _, pr := range c.candidates[cpl] { | ||
| if pr == p { | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| // push | ||
| c.candidates[cpl] = append(c.candidates[cpl], p) | ||
| return true | ||
| } | ||
|
|
||
| // pops a candidate from the top of the candidate queue for the given Cpl | ||
| // returns false if the queue is empty | ||
| // returns the peerId and true if successful | ||
| func (c *cplReplacementCache) pop(cpl uint) (peer.ID, bool) { | ||
| c.Lock() | ||
| defer c.Unlock() | ||
|
|
||
| if len(c.candidates[cpl]) != 0 { | ||
| p := c.candidates[cpl][0] | ||
| c.candidates[cpl] = c.candidates[cpl][1:] | ||
|
|
||
| // delete the queue if it's empty | ||
| if len(c.candidates[cpl]) == 0 { | ||
| delete(c.candidates, cpl) | ||
| } | ||
|
|
||
| return p, true | ||
| } | ||
| return "", false | ||
| } | ||
|
|
||
| // removes a given peer if it's present | ||
| // returns false if the peer is absent | ||
| func (c *cplReplacementCache) remove(p peer.ID) bool { | ||
| c.Lock() | ||
| defer c.Unlock() | ||
|
|
||
| cpl := uint(CommonPrefixLen(c.localPeer, ConvertPeerID(p))) | ||
|
|
||
| if len(c.candidates[cpl]) != 0 { | ||
| // remove the peer if it's present | ||
| for i, pr := range c.candidates[cpl] { | ||
| if pr == p { | ||
| c.candidates[cpl] = append(c.candidates[cpl][:i], c.candidates[cpl][i+1:]...) | ||
| } | ||
| } | ||
|
|
||
| // remove the queue if it's empty | ||
| if len(c.candidates[cpl]) == 0 { | ||
| delete(c.candidates, cpl) | ||
| } | ||
|
|
||
| return true | ||
| } | ||
| return false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package kbucket | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/libp2p/go-libp2p-core/peer" | ||
| "github.com/libp2p/go-libp2p-core/test" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestCplReplacementCache(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| maxQSize := 2 | ||
| local := ConvertPeerID(test.RandPeerIDFatal(t)) | ||
| c := newCplReplacementCache(local, maxQSize) | ||
|
|
||
| // pop an empty queue fails | ||
| p, b := c.pop(1) | ||
| require.Empty(t, p) | ||
| require.False(t, b) | ||
|
|
||
| // push two elements to an empty queue works | ||
| testPeer1 := genPeer(t, local, 1) | ||
| testPeer2 := genPeer(t, local, 1) | ||
|
|
||
| // pushing first peer works | ||
| require.True(t, c.push(testPeer1)) | ||
| // pushing a duplicate fails | ||
| require.False(t, c.push(testPeer1)) | ||
| // pushing another peers works | ||
| require.True(t, c.push(testPeer2)) | ||
|
|
||
| // popping the above pushes works | ||
| p, b = c.pop(1) | ||
| require.True(t, b) | ||
| require.Equal(t, testPeer1, p) | ||
| p, b = c.pop(1) | ||
| require.True(t, b) | ||
| require.Equal(t, testPeer2, p) | ||
|
|
||
| // pushing & popping again works | ||
| require.True(t, c.push(testPeer1)) | ||
| require.True(t, c.push(testPeer2)) | ||
| p, b = c.pop(1) | ||
| require.True(t, b) | ||
| require.Equal(t, testPeer1, p) | ||
| p, b = c.pop(1) | ||
| require.True(t, b) | ||
| require.Equal(t, testPeer2, p) | ||
|
|
||
| // fill up a queue | ||
| p1 := genPeer(t, local, 2) | ||
| p2 := genPeer(t, local, 2) | ||
| require.True(t, c.push(p1)) | ||
| require.True(t, c.push(p2)) | ||
|
|
||
| // push should not work on a full queue | ||
| p3 := genPeer(t, local, 2) | ||
| require.False(t, c.push(p3)) | ||
|
|
||
| // remove a peer & verify it's been removed | ||
| p4 := genPeer(t, local, 0) | ||
| require.True(t, c.push(p4)) | ||
|
|
||
| c.Lock() | ||
| require.Len(t, c.candidates[0], 1) | ||
| require.True(t, c.candidates[0][0] == p4) | ||
| c.Unlock() | ||
|
|
||
| require.True(t, c.remove(p4)) | ||
|
|
||
| c.Lock() | ||
| require.Len(t, c.candidates[0], 0) | ||
| c.Unlock() | ||
| } | ||
|
|
||
| func genPeer(t *testing.T, local ID, cpl int) peer.ID { | ||
| var p peer.ID | ||
| for { | ||
| p = test.RandPeerIDFatal(t) | ||
| if CommonPrefixLen(local, ConvertPeerID(p)) == cpl { | ||
| return p | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.