rewrite id hash queue

common/collect/sized_queue.go

@@ -0,0 +1,24 @@
+package collect
+
+type SizedQueue struct {
+	elements []interface{}
+	nextPos  int
+}
+
+func NewSizedQueue(size int) *SizedQueue {
+	return &SizedQueue{
+		elements: make([]interface{}, size),
+		nextPos:  0,
+	}
+}
+
+// Put puts a new element into the queue and pop out the first element if queue is full.
+func (this *SizedQueue) Put(element interface{}) interface{} {
+	res := this.elements[this.nextPos]
+	this.elements[this.nextPos] = element
+	this.nextPos++
+	if this.nextPos == len(this.elements) {
+		this.nextPos = 0
+	}
+	return res
+}

common/collect/timed_queue.go

@@ -1,105 +0,0 @@
-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) {
-	queue[i], queue[j] = queue[j], queue[i]
-}
-
-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]
-	old[n-1] = nil
-	*queue = old[:n-1]
-	return v
-}
-
-// TimedQueue is a priority queue that entries with oldest timestamp get removed first.
-type TimedQueue struct {
-	queue           timedQueueImpl
-	access          sync.Mutex
-	removedCallback func(interface{})
-}
-
-func NewTimedQueue(updateInterval int, removedCallback func(interface{})) *TimedQueue {
-	queue := &TimedQueue{
-		queue:           make([]*timedQueueEntry, 0, 256),
-		removedCallback: removedCallback,
-		access:          sync.Mutex{},
-	}
-	go queue.cleanup(time.Tick(time.Duration(updateInterval) * time.Second))
-	return queue
-}
-
-func (queue *TimedQueue) Add(value interface{}, time2Remove int64) {
-	newEntry := &timedQueueEntry{
-		timeSec: time2Remove,
-		value:   value,
-	}
-	var removedEntry *timedQueueEntry
-	queue.access.Lock()
-	nowSec := time.Now().Unix()
-	if queue.queue.Len() > 0 && queue.queue[0].timeSec < nowSec {
-		removedEntry = queue.queue[0]
-		queue.queue[0] = newEntry
-		heap.Fix(&queue.queue, 0)
-	} else {
-		heap.Push(&queue.queue, newEntry)
-	}
-	queue.access.Unlock()
-	if removedEntry != nil {
-		queue.removedCallback(removedEntry.value)
-	}
-}
-
-func (queue *TimedQueue) cleanup(tick <-chan time.Time) {
-	for now := range tick {
-		nowSec := now.Unix()
-		removedEntries := make([]*timedQueueEntry, 0, 128)
-		queue.access.Lock()
-		changed := false
-		for i := 0; i < queue.queue.Len(); i++ {
-			entry := queue.queue[i]
-			if entry.timeSec < nowSec {
-				removedEntries = append(removedEntries, entry)
-				queue.queue.Swap(i, queue.queue.Len()-1)
-				queue.queue.Pop()
-				changed = true
-			} else {
-				break
-			}
-		}
-		if changed {
-			heap.Init(&queue.queue)
-		}
-		queue.access.Unlock()
-		for _, entry := range removedEntries {
-			queue.removedCallback(entry.value)
-		}
-	}
-}

common/collect/timed_queue_test.go

@@ -1,56 +0,0 @@
-package collect
-
-import (
-	"testing"
-	"time"
-
-	v2testing "github.com/v2ray/v2ray-core/testing"
-	"github.com/v2ray/v2ray-core/testing/assert"
-)
-
-func TestTimedQueue(t *testing.T) {
-	v2testing.Current(t)
-
-	removed := make(map[string]bool)
-
-	nowSec := time.Now().Unix()
-	q := NewTimedQueue(2, func(v interface{}) {
-		removed[v.(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().Unix()+10)
-
-	<-tick
-	v1, ok = removed["Value1"]
-	assert.Bool(ok).IsTrue()
-	assert.Bool(v1).IsFalse()
-}