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

Cleanup queue in time

pull/40/head
V2Ray 2015-10-10 21:29:37 +02:00
parent ab151cc053
commit 7fe9683f28
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/collect/timed_queue.go
View File

@ -71,8 +71,7 @@ func (queue *TimedQueue) RemovedEntries() <-chan interface{} {
} }
func (queue *TimedQueue) cleanup(tick <-chan time.Time) { func (queue *TimedQueue) cleanup(tick <-chan time.Time) {
for { for now := range tick {
now := <-tick
queue.access.RLock() queue.access.RLock()
queueLen := queue.queue.Len() queueLen := queue.queue.Len()
queue.access.RUnlock() queue.access.RUnlock()
@ -80,16 +79,18 @@ func (queue *TimedQueue) cleanup(tick <-chan time.Time) {
continue continue
} }
nowSec := now.UTC().Unix() nowSec := now.UTC().Unix()
for {
queue.access.RLock() queue.access.RLock()
firstEntryTime := queue.queue[0].timeSec entry := queue.queue[0]
queue.access.RUnlock() queue.access.RUnlock()
if firstEntryTime > nowSec { if entry.timeSec > nowSec {
continue break
} }
queue.access.Lock() queue.access.Lock()
firstEntryValue := heap.Pop(&queue.queue).(*timedQueueEntry).value heap.Pop(&queue.queue)
queue.access.Unlock() queue.access.Unlock()
queue.removed <- firstEntryValue queue.removed <- entry.value
}
} }
} }