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

memory: remove usage of defer for PeerStore

Browse source 
Removing the overhead of the defer keyword improved performance of some
benchmarks up to 35%.
This commit is contained in:
Leo Balduf 2016-08-01 16:41:50 -04:00
parent ab6726b895
commit e338b97a07
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
server/store/memory/peer_store.go
View file

@ -113,7 +113,6 @@ func (s *peerStore) PutSeeder(infoHash chihaya.InfoHash, p chihaya.Peer) error {
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
shard.Lock() shard.Lock()
defer shard.Unlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.swarms[infoHash] = swarm{ shard.swarms[infoHash] = swarm{
@ -124,6 +123,7 @@ func (s *peerStore) PutSeeder(infoHash chihaya.InfoHash, p chihaya.Peer) error {
shard.swarms[infoHash].seeders[peerKey(p)] = time.Now().UnixNano() shard.swarms[infoHash].seeders[peerKey(p)] = time.Now().UnixNano()
shard.Unlock()
return nil return nil
} }
@ -137,13 +137,14 @@ func (s *peerStore) DeleteSeeder(infoHash chihaya.InfoHash, p chihaya.Peer) erro
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
pk := peerKey(p) pk := peerKey(p)
shard.Lock() shard.Lock()
defer shard.Unlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.Unlock()
return store.ErrResourceDoesNotExist return store.ErrResourceDoesNotExist
} }
if _, ok := shard.swarms[infoHash].seeders[pk]; !ok { if _, ok := shard.swarms[infoHash].seeders[pk]; !ok {
shard.Unlock()
return store.ErrResourceDoesNotExist return store.ErrResourceDoesNotExist
} }
@ -153,6 +154,7 @@ func (s *peerStore) DeleteSeeder(infoHash chihaya.InfoHash, p chihaya.Peer) erro
delete(shard.swarms, infoHash) delete(shard.swarms, infoHash)
} }
shard.Unlock()
return nil return nil
} }
@ -165,7 +167,6 @@ func (s *peerStore) PutLeecher(infoHash chihaya.InfoHash, p chihaya.Peer) error
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
shard.Lock() shard.Lock()
defer shard.Unlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.swarms[infoHash] = swarm{ shard.swarms[infoHash] = swarm{
@ -176,6 +177,7 @@ func (s *peerStore) PutLeecher(infoHash chihaya.InfoHash, p chihaya.Peer) error
shard.swarms[infoHash].leechers[peerKey(p)] = time.Now().UnixNano() shard.swarms[infoHash].leechers[peerKey(p)] = time.Now().UnixNano()
shard.Unlock()
return nil return nil
} }
@ -189,13 +191,14 @@ func (s *peerStore) DeleteLeecher(infoHash chihaya.InfoHash, p chihaya.Peer) err
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
pk := peerKey(p) pk := peerKey(p)
shard.Lock() shard.Lock()
defer shard.Unlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.Unlock()
return store.ErrResourceDoesNotExist return store.ErrResourceDoesNotExist
} }
if _, ok := shard.swarms[infoHash].leechers[pk]; !ok { if _, ok := shard.swarms[infoHash].leechers[pk]; !ok {
shard.Unlock()
return store.ErrResourceDoesNotExist return store.ErrResourceDoesNotExist
} }
@ -205,6 +208,7 @@ func (s *peerStore) DeleteLeecher(infoHash chihaya.InfoHash, p chihaya.Peer) err
delete(shard.swarms, infoHash) delete(shard.swarms, infoHash)
} }
shard.Unlock()
return nil return nil
} }
@ -218,7 +222,6 @@ func (s *peerStore) GraduateLeecher(infoHash chihaya.InfoHash, p chihaya.Peer) e
key := peerKey(p) key := peerKey(p)
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
shard.Lock() shard.Lock()
defer shard.Unlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.swarms[infoHash] = swarm{ shard.swarms[infoHash] = swarm{
@ -231,6 +234,7 @@ func (s *peerStore) GraduateLeecher(infoHash chihaya.InfoHash, p chihaya.Peer) e
shard.swarms[infoHash].seeders[key] = time.Now().UnixNano() shard.swarms[infoHash].seeders[key] = time.Now().UnixNano()
shard.Unlock()
return nil return nil
} }
@ -290,9 +294,9 @@ func (s *peerStore) AnnouncePeers(infoHash chihaya.InfoHash, seeder bool, numWan
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
shard.RLock() shard.RLock()
defer shard.RUnlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.RUnlock()
return nil, nil, store.ErrResourceDoesNotExist return nil, nil, store.ErrResourceDoesNotExist
} }
@ -354,6 +358,7 @@ func (s *peerStore) AnnouncePeers(infoHash chihaya.InfoHash, seeder bool, numWan
} }
} }
shard.RUnlock()
return return
} }
@ -366,9 +371,9 @@ func (s *peerStore) GetSeeders(infoHash chihaya.InfoHash) (peers, peers6 []chiha
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
shard.RLock() shard.RLock()
defer shard.RUnlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.RUnlock()
return nil, nil, store.ErrResourceDoesNotExist return nil, nil, store.ErrResourceDoesNotExist
} }
@ -381,6 +386,8 @@ func (s *peerStore) GetSeeders(infoHash chihaya.InfoHash) (peers, peers6 []chiha
peers = append(peers, decodedPeer) peers = append(peers, decodedPeer)
} }
} }
shard.RUnlock()
return return
} }
@ -393,9 +400,9 @@ func (s *peerStore) GetLeechers(infoHash chihaya.InfoHash) (peers, peers6 []chih
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
shard.RLock() shard.RLock()
defer shard.RUnlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.RUnlock()
return nil, nil, store.ErrResourceDoesNotExist return nil, nil, store.ErrResourceDoesNotExist
} }
@ -408,6 +415,8 @@ func (s *peerStore) GetLeechers(infoHash chihaya.InfoHash) (peers, peers6 []chih
peers = append(peers, decodedPeer) peers = append(peers, decodedPeer)
} }
} }
shard.RUnlock()
return return
} }
@ -420,13 +429,16 @@ func (s *peerStore) NumSeeders(infoHash chihaya.InfoHash) int {
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
shard.RLock() shard.RLock()
defer shard.RUnlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.RUnlock()
return 0 return 0
} }
return len(shard.swarms[infoHash].seeders) numSeeders := len(shard.swarms[infoHash].seeders)
shard.RUnlock()
return numSeeders
} }
func (s *peerStore) NumLeechers(infoHash chihaya.InfoHash) int { func (s *peerStore) NumLeechers(infoHash chihaya.InfoHash) int {
@ -438,13 +450,16 @@ func (s *peerStore) NumLeechers(infoHash chihaya.InfoHash) int {
shard := s.shards[s.shardIndex(infoHash)] shard := s.shards[s.shardIndex(infoHash)]
shard.RLock() shard.RLock()
defer shard.RUnlock()
if _, ok := shard.swarms[infoHash]; !ok { if _, ok := shard.swarms[infoHash]; !ok {
shard.RUnlock()
return 0 return 0
} }
return len(shard.swarms[infoHash].leechers) numLeechers := len(shard.swarms[infoHash].leechers)
shard.RUnlock()
return numLeechers
} }
func (s *peerStore) Stop() <-chan error { func (s *peerStore) Stop() <-chan error {