opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-02 12:20:03 +08:00
Code Issues Projects Releases Wiki Activity

sync safety to pq

Browse Source
This commit is contained in:
Juan Batiz-Benet
2014-09-17 03:16:06 -07:00
committed by Brian Tiger Chow
parent a21c1b6b62
commit 51eeec1a79
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
peer/queue/distance.go
View File

@ -3,6 +3,7 @@ package queue
import ( import (
"container/heap" "container/heap"
"math/big" "math/big"
"sync"
peer "github.com/jbenet/go-ipfs/peer" peer "github.com/jbenet/go-ipfs/peer"
ks "github.com/jbenet/go-ipfs/routing/keyspace" ks "github.com/jbenet/go-ipfs/routing/keyspace"
@ -25,17 +26,19 @@ type distancePQ struct {
// peers is a heap of peerDistance items // peers is a heap of peerDistance items
peers []*peerDistance peers []*peerDistance
sync.RWMutex
} }
func (pq distancePQ) Len() int { func (pq *distancePQ) Len() int {
return len(pq.peers) return len(pq.peers)
} }
func (pq distancePQ) Less(i, j int) bool { func (pq *distancePQ) Less(i, j int) bool {
return -1 == pq.peers[i].distance.Cmp(pq.peers[j].distance) return -1 == pq.peers[i].distance.Cmp(pq.peers[j].distance)
} }
func (pq distancePQ) Swap(i, j int) { func (pq *distancePQ) Swap(i, j int) {
p := pq.peers p := pq.peers
p[i], p[j] = p[j], p[i] p[i], p[j] = p[j], p[i]
} }
@ -54,6 +57,9 @@ func (pq *distancePQ) Pop() interface{} {
} }
func (pq *distancePQ) Enqueue(p *peer.Peer) { func (pq *distancePQ) Enqueue(p *peer.Peer) {
pq.Lock()
defer pq.Unlock()
distance := ks.XORKeySpace.Key(p.ID).Distance(pq.from) distance := ks.XORKeySpace.Key(p.ID).Distance(pq.from)
heap.Push(pq, &peerDistance{ heap.Push(pq, &peerDistance{
@ -63,6 +69,9 @@ func (pq *distancePQ) Enqueue(p *peer.Peer) {
} }
func (pq *distancePQ) Dequeue() *peer.Peer { func (pq *distancePQ) Dequeue() *peer.Peer {
pq.Lock()
defer pq.Unlock()
if len(pq.peers) < 1 { if len(pq.peers) < 1 {
panic("called Dequeue on an empty PeerQueue") panic("called Dequeue on an empty PeerQueue")
// will panic internally anyway, but we can help debug here // will panic internally anyway, but we can help debug here