更新

guonaihong · guonaihong · commit 842da421cba3 · 2024-02-16T14:15:57.000+08:00
Signed-off-by: guonaihong &lt;guonaihong@qq.com&gt;
diff --git a/min_heap.go b/min_heap.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import (
diff --git a/min_heap_node.go b/min_heap_node.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import (
diff --git a/min_heap_node_test.go b/min_heap_node_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
+
 package timer
 
 import (
diff --git a/min_heap_test.go b/min_heap_test.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import (
diff --git a/option.go b/option.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 type option struct {
@@ -21,14 +24,14 @@ func WithMinHeap() Option {
 	}
 }
 
-//TODO
+// TODO
 func WithSkipList() Option {
 	return func(o *option) {
 		o.skiplist = true
 	}
 }
 
-//TODO
+// TODO
 func WithRbtree() Option {
 	return func(o *option) {
 		o.rbtree = true
diff --git a/t_test.go b/t_test.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import (
diff --git a/time_wheel.go b/time_wheel.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import (
diff --git a/time_wheel_node.go b/time_wheel_node.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import (
@@ -105,5 +108,5 @@ func (t *timeNode) Reset(expire time.Duration) {
 	expire = expire/(time.Millisecond*10) + time.Duration(jiffies)
 	t.expire = uint64(expire)
 
-	t.root.add(t, atomic.LoadUint64(&t.root.jiffies))
+	t.root.add(t, jiffies)
 }
diff --git a/time_wheel_test.go b/time_wheel_test.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import (
diff --git a/time_wheel_utils.go b/time_wheel_utils.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import "time"
diff --git a/timer.go b/timer.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import "time"
@@ -27,7 +30,8 @@ type Timer interface {
 // 停止单个定时器
 type TimeNoder interface {
 	Stop()
-	Reset(d time.Duration)
+	// 重置时间器
+	Reset(expire time.Duration)
 }
 
 // 定时器构造函数
diff --git a/timer_test.go b/timer_test.go
@@ -1,7 +1,11 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import (
 	"log"
+	"sync"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -34,7 +38,7 @@ func Test_ScheduleFunc(t *testing.T) {
 
 func Test_AfterFunc(t *testing.T) {
 	tm := NewTimer()
-
+	go tm.Run()
 	log.Printf("start\n")
 
 	count := uint32(0)
@@ -60,11 +64,9 @@ func Test_AfterFunc(t *testing.T) {
 		tm.AfterFunc(time.Hour*24*365*12, nil)
 	*/
 
-	go func() {
-		time.Sleep(time.Second + time.Millisecond*100)
-		tm.Stop()
-	}()
-	tm.Run()
+	time.Sleep(time.Second + time.Millisecond*100)
+	tm.Stop()
+
 	if count != 2 {
 		t.Errorf("count:%d != 2\n", count)
 	}
@@ -107,3 +109,111 @@ func Test_Node_Stop(t *testing.T) {
 	}
 
 }
+
+// 测试重置定时器
+func Test_Reset(t *testing.T) {
+	t.Run("min heap reset", func(t *testing.T) {
+
+		tm := NewTimer(WithMinHeap())
+
+		go tm.Run()
+		count := int32(0)
+
+		tc := make(chan time.Duration, 2)
+
+		var mu sync.Mutex
+		isClose := false
+		now := time.Now()
+		node1 := tm.AfterFunc(time.Millisecond*100, func() {
+
+			mu.Lock()
+			atomic.AddInt32(&count, 1)
+			if atomic.LoadInt32(&count) <= 2 && !isClose {
+				tc <- time.Since(now)
+			}
+			mu.Unlock()
+		})
+
+		node2 := tm.AfterFunc(time.Millisecond*100, func() {
+			mu.Lock()
+			atomic.AddInt32(&count, 1)
+			if atomic.LoadInt32(&count) <= 2 && !isClose {
+				tc <- time.Since(now)
+			}
+			mu.Unlock()
+		})
+		node1.Reset(time.Millisecond)
+		node2.Reset(time.Millisecond)
+
+		time.Sleep(time.Millisecond * 3)
+		mu.Lock()
+		isClose = true
+		close(tc)
+		node1.Stop()
+		node2.Stop()
+		mu.Unlock()
+		for tv := range tc {
+			if tv < time.Millisecond || tv > 2*time.Millisecond {
+				t.Errorf("tc < time.Millisecond tc > 2*time.Millisecond")
+
+			}
+		}
+		if atomic.LoadInt32(&count) != 2 {
+			t.Errorf("count:%d != 2", atomic.LoadInt32(&count))
+		}
+
+	})
+
+	t.Run("time wheel reset", func(t *testing.T) {
+		tm := NewTimer()
+
+		go func() {
+			tm.Run()
+		}()
+
+		count := int32(0)
+
+		tc := make(chan time.Duration, 2)
+
+		var mu sync.Mutex
+		isClose := false
+		now := time.Now()
+		node1 := tm.AfterFunc(time.Millisecond*10, func() {
+
+			mu.Lock()
+			atomic.AddInt32(&count, 1)
+			if atomic.LoadInt32(&count) <= 2 && !isClose {
+				tc <- time.Since(now)
+			}
+			mu.Unlock()
+		})
+
+		node2 := tm.AfterFunc(time.Millisecond*10, func() {
+			mu.Lock()
+			atomic.AddInt32(&count, 1)
+			if atomic.LoadInt32(&count) <= 2 && !isClose {
+				tc <- time.Since(now)
+			}
+			mu.Unlock()
+		})
+
+		node1.Reset(time.Millisecond * 20)
+		node2.Reset(time.Millisecond * 20)
+
+		time.Sleep(time.Millisecond * 40)
+		mu.Lock()
+		isClose = true
+		close(tc)
+		node1.Stop()
+		node2.Stop()
+		mu.Unlock()
+		for tv := range tc {
+			if tv < time.Millisecond*20 || tv > 2*time.Millisecond*20 {
+				t.Errorf("tc < time.Millisecond tc > 2*time.Millisecond")
+			}
+		}
+		if atomic.LoadInt32(&count) != 2 {
+			t.Errorf("count:%d != 2", atomic.LoadInt32(&count))
+		}
+	})
+}
diff --git a/timer_wheel_utils_test.go b/timer_wheel_utils_test.go
@@ -1,3 +1,6 @@
+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.
+//
+// mit license
 package timer
 
 import (

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+// Copyright 2020-2024 guonaihong, antlabs. All rights reserved.`
	`2`	`+//`
	`3`	`+// mit license`
`1`	`4`	`package timer`
`2`	`5`
`3`	`6`	`type option struct {`
`@@ -21,14 +24,14 @@ func WithMinHeap() Option {`
`21`	`24`	`}`
`22`	`25`	`}`
`23`	`26`
`24`		`-//TODO`
	`27`	`+// TODO`
`25`	`28`	`func WithSkipList() Option {`
`26`	`29`	`return func(o *option) {`
`27`	`30`	`o.skiplist = true`
`28`	`31`	`}`
`29`	`32`	`}`
`30`	`33`
`31`		`-//TODO`
	`34`	`+// TODO`
`32`	`35`	`func WithRbtree() Option {`
`33`	`36`	`return func(o *option) {`
`34`	`37`	`o.rbtree = true`