lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-05-26 14:09:06 -04:00
Code Issues Releases Wiki Activity

Refactor timed queue

Browse Source
This commit is contained in:
V2Ray
2015-09-28 01:11:40 +02:00
parent 0ce02fa857
commit 8f0cb97e89
5 changed files with 175 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
proxy/vmess/protocol/user/userset.go
View File

@@ -1,6 +1,7 @@
package user
import (
"sync"
"time"
"github.com/v2ray/v2ray-core/common/collect"
@@ -18,8 +19,10 @@ type UserSet interface {
}
type TimedUserSet struct {
validUserIds []ID
userHash *collect.TimedStringMap
validUserIds []ID
userHash map[string]indexTimePair
userHashDeleteQueue *collect.TimedQueue
access sync.RWMutex
}
type indexTimePair struct {
@@ -29,19 +32,34 @@ type indexTimePair struct {
func NewTimedUserSet() UserSet {
tus := &TimedUserSet{
validUserIds: make([]ID, 0, 16),
userHash: collect.NewTimedStringMap(updateIntervalSec),
validUserIds: make([]ID, 0, 16),
userHash: make(map[string]indexTimePair, 512),
userHashDeleteQueue: collect.NewTimedQueue(updateIntervalSec),
access: sync.RWMutex{},
}
go tus.updateUserHash(time.Tick(updateIntervalSec * time.Second))
go tus.removeEntries(tus.userHashDeleteQueue.RemovedEntries())
return tus
}
func (us *TimedUserSet) removeEntries(entries <-chan interface{}) {
for {
entry := <-entries
us.access.Lock()
delete(us.userHash, entry.(string))
us.access.Unlock()
}
}
func (us *TimedUserSet) generateNewHashes(lastSec, nowSec int64, idx int, id ID) {
idHash := NewTimeHash(HMACHash{})
for lastSec < nowSec+cacheDurationSec {
idHash := idHash.Hash(id.Bytes[:], lastSec)
log.Debug("Valid User Hash: %v", idHash)
us.userHash.Set(string(idHash), indexTimePair{idx, lastSec}, lastSec+2*cacheDurationSec)
us.access.Lock()
us.userHash[string(idHash)] = indexTimePair{idx, lastSec}
us.access.Unlock()
us.userHashDeleteQueue.Add(string(idHash), lastSec+2*cacheDurationSec)
lastSec++
}
}
@@ -73,9 +91,10 @@ func (us *TimedUserSet) AddUser(user User) error {
}
func (us TimedUserSet) GetUser(userHash []byte) (*ID, int64, bool) {
rawPair, found := us.userHash.Get(string(userHash))
defer us.access.RUnlock()
us.access.RLock()
pair, found := us.userHash[string(userHash)]
if found {
pair := rawPair.(indexTimePair)
return &us.validUserIds[pair.index], pair.timeSec, true
}
return nil, 0, false