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

storage/memorysubnet: allocate CIDRMask only once

Browse source
This commit is contained in:
Jimmy Zelinskie 2017-05-03 20:49:20 -04:00
parent 496cc1a31d
commit 9ce6c31021
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
storage/memorybysubnet/peer_store.go
View file

@ -94,8 +94,8 @@ func New(cfg Config) (storage.PeerStore, error) {
ps := &peerStore{ ps := &peerStore{
shards: make([]*peerShard, shardCount*2), shards: make([]*peerShard, shardCount*2),
closed: make(chan struct{}), closed: make(chan struct{}),
ipv4Mask: cfg.PreferredIPv4SubnetMaskBits, ipv4Mask: net.CIDRMask(cfg.PreferredIPv4SubnetMaskBits, 32),
ipv6Mask: cfg.PreferredIPv6SubnetMaskBits, ipv6Mask: net.CIDRMask(cfg.PreferredIPv6SubnetMaskBits, 128),
} }
for i := 0; i < shardCount*2; i++ { for i := 0; i < shardCount*2; i++ {
@ -152,8 +152,8 @@ func (s swarm) lenLeechers() (i int) {
type peerStore struct { type peerStore struct {
shards []*peerShard shards []*peerShard
closed chan struct{} closed chan struct{}
ipv4Mask int ipv4Mask net.IPMask
ipv6Mask int ipv6Mask net.IPMask
} }
var _ storage.PeerStore = &peerStore{} var _ storage.PeerStore = &peerStore{}
@ -200,9 +200,9 @@ func (s *peerStore) mask(p bittorrent.Peer) string {
var maskedIP net.IP var maskedIP net.IP
switch p.IP.AddressFamily { switch p.IP.AddressFamily {
case bittorrent.IPv4: case bittorrent.IPv4:
maskedIP = p.IP.IP.Mask(net.CIDRMask(s.ipv4Mask, 32)) maskedIP = p.IP.IP.Mask(s.ipv4Mask)
case bittorrent.IPv6: case bittorrent.IPv6:
maskedIP = p.IP.IP.Mask(net.CIDRMask(s.ipv6Mask, 128)) maskedIP = p.IP.IP.Mask(s.ipv6Mask)
default: default:
panic("IP is neither v4 nor v6") panic("IP is neither v4 nor v6")
} }
@ -554,7 +554,7 @@ func (s *peerStore) collectGarbage(cutoff time.Time) error {
} }
for subnet := range shard.swarms[ih].seeders { for subnet := range shard.swarms[ih].seeders {
for pk, mtime := range shard.swarms[ih].leechers[subnet] { for pk, mtime := range shard.swarms[ih].seeders[subnet] {
if mtime <= cutoffUnix { if mtime <= cutoffUnix {
delete(shard.swarms[ih].seeders[subnet], pk) delete(shard.swarms[ih].seeders[subnet], pk)
} }

6
storage/memorybysubnet/peer_store_test.go
View file

@ -2,14 +2,16 @@ package memorybysubnet
import ( import (
"testing" "testing"
"time" "time"
s "github.com/chihaya/chihaya/storage" s "github.com/chihaya/chihaya/storage"
) )
func createNew() s.PeerStore { func createNew() s.PeerStore {
ps, err := New(Config{ShardCount: 1024, GarbageCollectionInterval: 10 * time.Minute}) ps, err := New(Config{
ShardCount: 1024,
GarbageCollectionInterval: 10 * time.Minute,
})
if err != nil { if err != nil {
panic(err) panic(err)
} }