github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

use [16]byte instead of string for faster hashing

pull/69/head
v2ray 2016-01-12 13:02:05 +01:00
parent bed5235772
commit 48ff2a5ae8
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
proxy/vmess/protocol/userset.go
View File

@ -44,7 +44,7 @@ type UserSet interface {
type TimedUserSet struct { type TimedUserSet struct {
validUsers []vmess.User validUsers []vmess.User
userHash map[string]indexTimePair userHash map[[16]byte]indexTimePair
ids []*idEntry ids []*idEntry
access sync.RWMutex access sync.RWMutex
} }
@ -57,7 +57,7 @@ type indexTimePair struct {
func NewTimedUserSet() UserSet { func NewTimedUserSet() UserSet {
tus := &TimedUserSet{ tus := &TimedUserSet{
validUsers: make([]vmess.User, 0, 16), validUsers: make([]vmess.User, 0, 16),
userHash: make(map[string]indexTimePair, 512), userHash: make(map[[16]byte]indexTimePair, 512),
access: sync.RWMutex{}, access: sync.RWMutex{},
ids: make([]*idEntry, 0, 512), ids: make([]*idEntry, 0, 512),
} }
@ -66,21 +66,21 @@ func NewTimedUserSet() UserSet {
} }
func (us *TimedUserSet) generateNewHashes(nowSec Timestamp, idx int, entry *idEntry) { func (us *TimedUserSet) generateNewHashes(nowSec Timestamp, idx int, entry *idEntry) {
for entry.lastSec <= nowSec { var hashValue [16]byte
idHash := IDHash(entry.id.Bytes()) idHash := IDHash(entry.id.Bytes())
for entry.lastSec <= nowSec {
idHash.Write(entry.lastSec.Bytes()) idHash.Write(entry.lastSec.Bytes())
idHashSlice := idHash.Sum(nil) idHash.Sum(hashValue[:0])
hashValue := string(idHashSlice) idHash.Reset()
us.access.Lock()
us.userHash[hashValue] = indexTimePair{idx, entry.lastSec}
us.access.Unlock()
hash2Remove := entry.hashes.Put(hashValue) hash2Remove := entry.hashes.Put(hashValue)
if hash2Remove != nil {
us.access.Lock() us.access.Lock()
delete(us.userHash, hash2Remove.(string)) us.userHash[hashValue] = indexTimePair{idx, entry.lastSec}
us.access.Unlock() if hash2Remove != nil {
delete(us.userHash, hash2Remove.([16]byte))
} }
us.access.Unlock()
entry.lastSec++ entry.lastSec++
} }
} }
@ -125,7 +125,9 @@ func (us *TimedUserSet) AddUser(user vmess.User) error {
func (us *TimedUserSet) GetUser(userHash []byte) (vmess.User, Timestamp, bool) { func (us *TimedUserSet) GetUser(userHash []byte) (vmess.User, Timestamp, bool) {
defer us.access.RUnlock() defer us.access.RUnlock()
us.access.RLock() us.access.RLock()
pair, found := us.userHash[string(userHash)] var fixedSizeHash [16]byte
copy(fixedSizeHash[:], userHash)
pair, found := us.userHash[fixedSizeHash]
if found { if found {
return us.validUsers[pair.index], pair.timeSec, true return us.validUsers[pair.index], pair.timeSec, true
} }