Refactor timed queue

This commit is contained in:
V2Ray committed 2015-09-28 01:11:40 +02:00
1 parent 0ce02fa857
commit 8f0cb97e89
5 files changed
+175 -166

No files matched your search

-111
View File
@@ -1,111 +0,0 @@
package collect
import (
"container/heap"
"sync"
"time"
)
type timedQueueEntry struct {
timeSec int64
value interface{}
}
type timedQueue []*timedQueueEntry
func (queue timedQueue) Len() int {
return len(queue)
}
func (queue timedQueue) Less(i, j int) bool {
return queue[i].timeSec < queue[j].timeSec
}
func (queue timedQueue) Swap(i, j int) {
tmp := queue[i]
queue[i] = queue[j]
queue[j] = tmp
}
func (queue *timedQueue) Push(value interface{}) {
entry := value.(*timedQueueEntry)
*queue = append(*queue, entry)
}
func (queue *timedQueue) Pop() interface{} {
old := *queue
n := len(old)
v := old[n-1]
*queue = old[:n-1]
return v
}
type TimedStringMap struct {
timedQueue
queueMutex sync.Mutex
dataMutext sync.RWMutex
data map[string]interface{}
interval int
}
func NewTimedStringMap(updateInterval int) *TimedStringMap {
m := &TimedStringMap{
timedQueue: make([]*timedQueueEntry, 0, 1024),
queueMutex: sync.Mutex{},
dataMutext: sync.RWMutex{},
data: make(map[string]interface{}, 1024),
interval: updateInterval,
}
m.initialize()
return m
}
func (m *TimedStringMap) initialize() {
go m.cleanup(time.Tick(time.Duration(m.interval) * time.Second))
}
func (m *TimedStringMap) cleanup(tick <-chan time.Time) {
for {
now := <-tick
nowSec := now.UTC().Unix()
if m.timedQueue.Len() == 0 {
continue
}
for m.timedQueue.Len() > 0 {
entry := m.timedQueue[0]
if entry.timeSec > nowSec {
break
}
m.queueMutex.Lock()
entry = heap.Pop(&m.timedQueue).(*timedQueueEntry)
m.queueMutex.Unlock()
m.Remove(entry.value.(string))
}
}
}
func (m *TimedStringMap) Get(key string) (interface{}, bool) {
m.dataMutext.RLock()
value, ok := m.data[key]
m.dataMutext.RUnlock()
return value, ok
}
func (m *TimedStringMap) Set(key string, value interface{}, time2Delete int64) {
m.dataMutext.Lock()
m.data[key] = value
m.dataMutext.Unlock()
m.queueMutex.Lock()
heap.Push(&m.timedQueue, &timedQueueEntry{
timeSec: time2Delete,
value: key,
})
m.queueMutex.Unlock()
}
func (m *TimedStringMap) Remove(key string) {
m.dataMutext.Lock()
delete(m.data, key)
m.dataMutext.Unlock()
}
-48
View File
@@ -1,48 +0,0 @@
package collect
import (
"testing"
"time"
"github.com/v2ray/v2ray-core/testing/unit"
)
func TestTimedStringMap(t *testing.T) {
assert := unit.Assert(t)
nowSec := time.Now().UTC().Unix()
m := NewTimedStringMap(2)
m.Set("Key1", "Value1", nowSec)
m.Set("Key2", "Value2", nowSec+5)
v1, ok := m.Get("Key1")
assert.Bool(ok).IsTrue()
assert.String(v1.(string)).Equals("Value1")
v2, ok := m.Get("Key2")
assert.Bool(ok).IsTrue()
assert.String(v2.(string)).Equals("Value2")
tick := time.Tick(4 * time.Second)
<-tick
v1, ok = m.Get("Key1")
assert.Bool(ok).IsFalse()
v2, ok = m.Get("Key2")
assert.Bool(ok).IsTrue()
assert.String(v2.(string)).Equals("Value2")
<-tick
v2, ok = m.Get("Key2")
assert.Bool(ok).IsFalse()
<-tick
v2, ok = m.Get("Key2")
assert.Bool(ok).IsFalse()
m.Set("Key1", "Value1", time.Now().UTC().Unix()+10)
v1, ok = m.Get("Key1")
assert.Bool(ok).IsTrue()
assert.String(v1.(string)).Equals("Value1")
}
+89
View File
@@ -0,0 +1,89 @@
package collect
import (
"container/heap"
"sync"
"time"
)
type timedQueueEntry struct {
timeSec int64
value interface{}
}
type timedQueueImpl []*timedQueueEntry
func (queue timedQueueImpl) Len() int {
return len(queue)
}
func (queue timedQueueImpl) Less(i, j int) bool {
return queue[i].timeSec < queue[j].timeSec
}
func (queue timedQueueImpl) Swap(i, j int) {
tmp := queue[i]
queue[i] = queue[j]
queue[j] = tmp
}
func (queue *timedQueueImpl) Push(value interface{}) {
entry := value.(*timedQueueEntry)
*queue = append(*queue, entry)
}
func (queue *timedQueueImpl) Pop() interface{} {
old := *queue
n := len(old)
v := old[n-1]
*queue = old[:n-1]
return v
}
type TimedQueue struct {
queue timedQueueImpl
access sync.Mutex
removed chan interface{}
}
func NewTimedQueue(updateInterval int) *TimedQueue {
queue := &TimedQueue{
queue: make([]*timedQueueEntry, 0, 256),
removed: make(chan interface{}, 16),
access: sync.Mutex{},
}
go queue.cleanup(time.Tick(time.Duration(updateInterval) * time.Second))
return queue
}
func (queue *TimedQueue) Add(value interface{}, time2Remove int64) {
queue.access.Lock()
heap.Push(&queue.queue, &timedQueueEntry{
timeSec: time2Remove,
value: value,
})
queue.access.Unlock()
}
func (queue *TimedQueue) RemovedEntries() <-chan interface{} {
return queue.removed
}
func (queue *TimedQueue) cleanup(tick <-chan time.Time) {
for {
now := <-tick
if queue.queue.Len() == 0 {
continue
}
nowSec := now.UTC().Unix()
entry := queue.queue[0]
if entry.timeSec > nowSec {
continue
}
queue.access.Lock()
entry = heap.Pop(&queue.queue).(*timedQueueEntry)
queue.access.Unlock()
queue.removed <- entry.value
}
}
+60
View File
@@ -0,0 +1,60 @@
package collect
import (
"testing"
"time"
"github.com/v2ray/v2ray-core/testing/unit"
)
func TestTimedQueue(t *testing.T) {
assert := unit.Assert(t)
removed := make(map[string]bool)
nowSec := time.Now().UTC().Unix()
q := NewTimedQueue(2)
go func() {
for {
entry := <-q.RemovedEntries()
removed[entry.(string)] = true
}
}()
q.Add("Value1", nowSec)
q.Add("Value2", nowSec+5)
v1, ok := removed["Value1"]
assert.Bool(ok).IsFalse()
v2, ok := removed["Value2"]
assert.Bool(ok).IsFalse()
tick := time.Tick(4 * time.Second)
<-tick
v1, ok = removed["Value1"]
assert.Bool(ok).IsTrue()
assert.Bool(v1).IsTrue()
removed["Value1"] = false
v2, ok = removed["Value2"]
assert.Bool(ok).IsFalse()
<-tick
v2, ok = removed["Value2"]
assert.Bool(ok).IsTrue()
assert.Bool(v2).IsTrue()
removed["Value2"] = false
<-tick
assert.Bool(removed["Values"]).IsFalse()
q.Add("Value1", time.Now().UTC().Unix()+10)
<-tick
v1, ok = removed["Value1"]
assert.Bool(ok).IsTrue()
assert.Bool(v1).IsFalse()
}