LBRYCommunity/tracker
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

storage/memorybysubnet: s/mask/preferredSubnet

Browse source
This commit is contained in:
Jimmy Zelinskie 2017-05-03 21:16:47 -04:00
parent d07b61d67d
commit cb6a3be2ac
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
storage/memorybysubnet/peer_store.go
View file

@ -225,11 +225,11 @@ func (s *peerStore) PutSeeder(ih bittorrent.InfoHash, p bittorrent.Peer) error {
recordInfohashesDelta(1) recordInfohashesDelta(1)
} }
mask := s.mask(p) preferredSubnet := s.mask(p)
if shard.swarms[ih].seeders[mask] == nil { if shard.swarms[ih].seeders[preferredSubnet] == nil {
shard.swarms[ih].seeders[mask] = make(map[serializedPeer]int64) shard.swarms[ih].seeders[preferredSubnet] = make(map[serializedPeer]int64)
} }
shard.swarms[ih].seeders[mask][pk] = time.Now().UnixNano() shard.swarms[ih].seeders[preferredSubnet][pk] = time.Now().UnixNano()
shard.Unlock() shard.Unlock()
return nil return nil
@ -252,13 +252,13 @@ func (s *peerStore) DeleteSeeder(ih bittorrent.InfoHash, p bittorrent.Peer) erro
return storage.ErrResourceDoesNotExist return storage.ErrResourceDoesNotExist
} }
mask := s.mask(p) preferredSubnet := s.mask(p)
if _, ok := shard.swarms[ih].seeders[mask][pk]; !ok { if _, ok := shard.swarms[ih].seeders[preferredSubnet][pk]; !ok {
shard.Unlock() shard.Unlock()
return storage.ErrResourceDoesNotExist return storage.ErrResourceDoesNotExist
} }
delete(shard.swarms[ih].seeders[mask], pk) delete(shard.swarms[ih].seeders[preferredSubnet], pk)
if shard.swarms[ih].lenSeeders()|shard.swarms[ih].lenLeechers() == 0 { if shard.swarms[ih].lenSeeders()|shard.swarms[ih].lenLeechers() == 0 {
delete(shard.swarms, ih) delete(shard.swarms, ih)
@ -289,11 +289,11 @@ func (s *peerStore) PutLeecher(ih bittorrent.InfoHash, p bittorrent.Peer) error
recordInfohashesDelta(1) recordInfohashesDelta(1)
} }
mask := s.mask(p) preferredSubnet := s.mask(p)
if shard.swarms[ih].leechers[mask] == nil { if shard.swarms[ih].leechers[preferredSubnet] == nil {
shard.swarms[ih].leechers[mask] = make(map[serializedPeer]int64) shard.swarms[ih].leechers[preferredSubnet] = make(map[serializedPeer]int64)
} }
shard.swarms[ih].leechers[mask][pk] = time.Now().UnixNano() shard.swarms[ih].leechers[preferredSubnet][pk] = time.Now().UnixNano()
shard.Unlock() shard.Unlock()
return nil return nil
@ -316,13 +316,13 @@ func (s *peerStore) DeleteLeecher(ih bittorrent.InfoHash, p bittorrent.Peer) err
return storage.ErrResourceDoesNotExist return storage.ErrResourceDoesNotExist
} }
mask := s.mask(p) preferredSubnet := s.mask(p)
if _, ok := shard.swarms[ih].leechers[mask][pk]; !ok { if _, ok := shard.swarms[ih].leechers[preferredSubnet][pk]; !ok {
shard.Unlock() shard.Unlock()
return storage.ErrResourceDoesNotExist return storage.ErrResourceDoesNotExist
} }
delete(shard.swarms[ih].leechers[mask], pk) delete(shard.swarms[ih].leechers[preferredSubnet], pk)
if shard.swarms[ih].lenSeeders()|shard.swarms[ih].lenLeechers() == 0 { if shard.swarms[ih].lenSeeders()|shard.swarms[ih].lenLeechers() == 0 {
delete(shard.swarms, ih) delete(shard.swarms, ih)
@ -353,13 +353,13 @@ func (s *peerStore) GraduateLeecher(ih bittorrent.InfoHash, p bittorrent.Peer) e
recordInfohashesDelta(1) recordInfohashesDelta(1)
} }
mask := s.mask(p) preferredSubnet := s.mask(p)
delete(shard.swarms[ih].leechers[mask], pk) delete(shard.swarms[ih].leechers[preferredSubnet], pk)
if shard.swarms[ih].seeders[mask] == nil { if shard.swarms[ih].seeders[preferredSubnet] == nil {
shard.swarms[ih].seeders[mask] = make(map[serializedPeer]int64) shard.swarms[ih].seeders[preferredSubnet] = make(map[serializedPeer]int64)
} }
shard.swarms[ih].seeders[mask][pk] = time.Now().UnixNano() shard.swarms[ih].seeders[preferredSubnet][pk] = time.Now().UnixNano()
shard.Unlock() shard.Unlock()
return nil return nil
@ -380,11 +380,11 @@ func (s *peerStore) AnnouncePeers(ih bittorrent.InfoHash, seeder bool, numWant i
return nil, storage.ErrResourceDoesNotExist return nil, storage.ErrResourceDoesNotExist
} }
mask := s.mask(announcer) preferredSubnet := s.mask(announcer)
if seeder { if seeder {
// Append as many close leechers as possible. // Append as many close leechers as possible.
closestLeechers := shard.swarms[ih].leechers[mask] closestLeechers := shard.swarms[ih].leechers[preferredSubnet]
for p := range closestLeechers { for p := range closestLeechers {
if numWant == 0 { if numWant == 0 {
break break
@ -398,7 +398,7 @@ func (s *peerStore) AnnouncePeers(ih bittorrent.InfoHash, seeder bool, numWant i
// Append the rest of the leechers. // Append the rest of the leechers.
if numWant > 0 { if numWant > 0 {
for subnet := range shard.swarms[ih].leechers { for subnet := range shard.swarms[ih].leechers {
if subnet == mask { if subnet == preferredSubnet {
continue continue
} }
@ -415,7 +415,7 @@ func (s *peerStore) AnnouncePeers(ih bittorrent.InfoHash, seeder bool, numWant i
} }
} else { } else {
// Append as many close seeders as possible. // Append as many close seeders as possible.
closestSeeders := shard.swarms[ih].seeders[mask] closestSeeders := shard.swarms[ih].seeders[preferredSubnet]
for p := range closestSeeders { for p := range closestSeeders {
if numWant == 0 { if numWant == 0 {
break break
@ -427,7 +427,7 @@ func (s *peerStore) AnnouncePeers(ih bittorrent.InfoHash, seeder bool, numWant i
} }
// Append as many close leechers as possible. // Append as many close leechers as possible.
closestLeechers := shard.swarms[ih].leechers[mask] closestLeechers := shard.swarms[ih].leechers[preferredSubnet]
for p := range closestLeechers { for p := range closestLeechers {
if numWant == 0 { if numWant == 0 {
break break
@ -441,7 +441,7 @@ func (s *peerStore) AnnouncePeers(ih bittorrent.InfoHash, seeder bool, numWant i
// Append as the rest of the seeders. // Append as the rest of the seeders.
if numWant > 0 { if numWant > 0 {
for subnet := range shard.swarms[ih].seeders { for subnet := range shard.swarms[ih].seeders {
if subnet == mask { if subnet == preferredSubnet {
continue continue
} }
@ -460,7 +460,7 @@ func (s *peerStore) AnnouncePeers(ih bittorrent.InfoHash, seeder bool, numWant i
// Append the rest of the leechers. // Append the rest of the leechers.
if numWant > 0 { if numWant > 0 {
for subnet := range shard.swarms[ih].leechers { for subnet := range shard.swarms[ih].leechers {
if subnet == mask { if subnet == preferredSubnet {
continue continue
} }