性能优化

Author: guonaihong

go.mod

@@ -2,4 +2,7 @@ module github.com/antlabs/timer
 
 go 1.13
 
-require gopkg.in/go-playground/assert.v1 v1.2.1
+require (
+	github.com/antlabs/stl v0.0.1
+	gopkg.in/go-playground/assert.v1 v1.2.1
+)

go.sum

@@ -1,2 +1,10 @@
+github.com/antlabs/stl v0.0.1 h1:TRD3csCrjREeLhLoQ/supaoCvFhNLBTNIwuRGrDIs6Q=
+github.com/antlabs/stl v0.0.1/go.mod h1:wvVwP1loadLG3cRjxUxK8RL4Co5xujGaZlhbztmUEqQ=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

time_wheel.go

@@ -1,11 +1,13 @@
 package timer
 
 import (
-	"container/list"
 	"context"
 	"fmt"
 	"sync/atomic"
 	"time"
+	"unsafe"
+
+	"github.com/antlabs/stl/list"
 )
 
 const (
@@ -57,12 +59,13 @@ func newTimeWheel() *timeWheel {
 func (t *timeWheel) init() {
 
 	for i := 0; i < nearSize; i++ {
-		t.t1[i] = &Time{List: list.New()}
+		t.t1[i] = newTimeHead()
+
 	}
 
 	for i := 0; i < 4; i++ {
 		for j := 0; j < levelSize; j++ {
-			t.t2Tot5[i][j] = &Time{List: list.New()}
+			t.t2Tot5[i][j] = newTimeHead()
 		}
 	}
 
@@ -161,27 +164,21 @@ func (t *timeWheel) Stop() {
 // 移动链表
 func (t *timeWheel) cascade(levelIndex int, index int) {
 
-	tmp := list.New()
+	tmp := newTimeHead()
 
 	l := t.t2Tot5[levelIndex][index]
 	l.Lock()
 
-	for e := l.Front(); e != nil; {
-		next := e.Next()
-		l.Remove(e)
-
-		tmp.PushBack(e.Value)
-
-		e = next
-	}
-
-	t.t2Tot5[levelIndex][index].Init()
+	l.ReplaceInit(&tmp.Head)
 
 	l.Unlock()
 
-	for e := tmp.Front(); e != nil; e = e.Next() {
-		t.add(e.Value.(*timeNode), atomic.LoadUint64(&t.jiffies))
-	}
+	offset := unsafe.Offsetof(tmp.Head)
+	tmp.ForEachSafe(func(pos *list.Head) {
+		node := (*timeNode)(pos.Entry(offset))
+		t.add(node, atomic.LoadUint64(&t.jiffies))
+	})
+
 }
 
 func (t *timeWheel) moveTot1(head *Time, index uint64) {
@@ -190,15 +187,7 @@ func (t *timeWheel) moveTot1(head *Time, index uint64) {
 	t1.Lock()
 	defer t1.Unlock()
 
-	for e := t1.Front(); e != nil; {
-		next := e.Next()
-
-		t1.Remove(e)
-		head.PushBack(e.Value)
-		e = next
-	}
-
-	t.t1[index].List.Init()
+	t1.ReplaceInit(&head.Head)
 }
 
 // moveAndExec函数功能
@@ -229,31 +218,31 @@ func (t *timeWheel) moveAndExec() {
 	atomic.AddUint64(&t.jiffies, 1)
 
 	t.t1[index].Lock()
-	if t.t1[index].List.Len() == 0 {
+	if t.t1[index].Len() == 0 {
 		t.t1[index].Unlock()
 		return
 	}
+
 	t.t1[index].Unlock()
 
-	head := Time{List: list.New()}
-	t.moveTot1(&head, index)
+	head := newTimeHead()
+	t.moveTot1(head, index)
 	// 执行
 
-	for e := head.Front(); e != nil; {
-
-		val := e.Value.(*timeNode)
-		next := e.Next()
-		head.Remove(e)
-		e = next
+	offset := unsafe.Offsetof(head.Head)
 
+	head.ForEachSafe(func(pos *list.Head) {
+		val := (*timeNode)(pos.Entry(offset))
+		head.Del(pos)
 		go val.callback()
 
 		if val.isSchedule {
 			jiffies := t.jiffies
 			val.expire = uint64(t.getExpire(val.userExpire, jiffies))
 			t.add(val, jiffies)
 		}
-	}
+	})
+
 }
 
 func (t *timeWheel) run() {

time_wheel_node.go

@@ -1,10 +1,11 @@
 package timer
 
 import (
-	"container/list"
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/antlabs/stl/list"
 )
 
 const (
@@ -16,19 +17,24 @@ const (
 // 先使用sync.Mutex实现功能
 // 后面使用cas优化
 type Time struct {
-	*list.List
-
+	timeNode
 	sync.Mutex
 }
 
+func newTimeHead() *Time {
+	head := &Time{}
+	head.Init()
+	return head
+}
+
 func (t *Time) lockPushBack(node *timeNode) {
 	t.Lock()
 	defer t.Unlock()
 	if atomic.LoadUint32(&node.lock) == haveStop {
 		return
 	}
 
-	node.element = t.PushBack(node)
+	t.AddTail(&node.Head)
 	node.list = t
 }
 
@@ -40,20 +46,10 @@ type timeNode struct {
 	close      uint32
 	lock       uint32
 
-	list    *Time
-	element *list.Element
-}
+	list *Time
 
-/*
-func (t *timeNode) grab() {
-	for {
-		prevVal := atomic.LoadUint32(&t.lock)
-		if atomic.CompareAndSwapUint32(&t.lock, prevVal, stopGrab) {
-			break
-		}
-	}
+	list.Head
 }
-*/
 
 func (t *timeNode) Stop() {
 	//这里和32行是竞争关系，拷贝一个副本，防止出现unlock unlock的情况
@@ -63,7 +59,5 @@ func (t *timeNode) Stop() {
 
 	atomic.StoreUint32(&t.close, haveStop)
 
-	//t.grab()
-
-	t.list.Remove(t.element)
+	t.list.Del(&t.Head)
 }