update

Author: chenjie199234

container/list/list.go

@@ -1,12 +1,13 @@
 package list
 
 import (
+	"errors"
 	"runtime"
 	"sync/atomic"
 	"unsafe"
 )
 
-//thread safe
+// thread safe
 type List[T any] struct {
 	head *node[T]
 	tail *node[T]
@@ -43,19 +44,25 @@ func (l *List[T]) Push(data T) {
 	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(&l.tail)), unsafe.Pointer(n))
 }
 
-//check func is used to check whether the next element can be popped,set nil if don't need it
-//return false - when the buf is empty,or the check failed
-func (l *List[T]) Pop(check func(d T) bool) (data T, ok bool) {
+var ErrPopEmpty = errors.New("pop empty list")
+var ErrPopCheckFailed = errors.New("pop list check failed")
+
+// check func is used to check whether the next element can be popped,set nil if don't need it
+// if e == ErrPopCheckFailed the data will return but it will not be poped from the list
+func (l *List[T]) Pop(check func(d T) bool) (data T, e error) {
 	for {
 		oldhead := l.head
 		if oldhead.next == nil {
+			e = ErrPopEmpty
 			return
 		}
 		if check != nil && !check(oldhead.next.value) {
+			data = oldhead.next.value
+			e = ErrPopCheckFailed
 			return
 		}
 		if atomic.CompareAndSwapPointer((*unsafe.Pointer)(unsafe.Pointer(&l.head)), unsafe.Pointer(oldhead), unsafe.Pointer(oldhead.next)) {
-			return oldhead.next.value, true
+			return oldhead.next.value, nil
 		}
 		runtime.Gosched()
 	}

container/ring/ring.go

@@ -1,6 +1,7 @@
 package ring
 
 import (
+	"errors"
 	"runtime"
 	"sync/atomic"
 )
@@ -37,16 +38,22 @@ func (b *Ring[T]) Push(d T) bool {
 	}
 }
 
+var ErrPopEmpty = errors.New("pop empty ring")
+var ErrPopCheckFailed = errors.New("pop ring check failed")
+
 // check func is used to check whether the next element can be popped,set nil if don't need it
-// return false - when the buf is empty,or the check failed
-func (b *Ring[T]) Pop(check func(d T) bool) (data T, ok bool) {
+// if e == ErrPopCheckFailed the data will return but it will not be poped from the ring
+func (b *Ring[T]) Pop(check func(d T) bool) (data T, e error) {
 	for {
 		oldPopTry := atomic.LoadUint64(&b.popTry)
 		if oldPopTry == atomic.LoadUint64(&b.pushConfirm) {
+			e = ErrPopEmpty
 			return
 		}
 		d := b.data[oldPopTry%atomic.LoadUint64(&b.length)]
 		if check != nil && !check(d) {
+			data = d
+			e = ErrPopCheckFailed
 			return
 		}
 		if !atomic.CompareAndSwapUint64(&b.popTry, oldPopTry, oldPopTry+1) {
@@ -55,6 +62,6 @@ func (b *Ring[T]) Pop(check func(d T) bool) (data T, ok bool) {
 		for !atomic.CompareAndSwapUint64(&b.popConfirm, oldPopTry, oldPopTry+1) {
 			runtime.Gosched()
 		}
-		return d, true
+		return d, nil
 	}
 }

container/stack/stack.go

@@ -1,12 +1,13 @@
 package stack
 
 import (
+	"errors"
 	"runtime"
 	"sync/atomic"
 	"unsafe"
 )
 
-//thread safe
+// thread safe
 type Stack[T any] struct {
 	top *node[T]
 }
@@ -31,19 +32,25 @@ func (s *Stack[T]) Push(data T) {
 	}
 }
 
-//check func is used to check whether the next element can be popped,set nil if don't need it
-//return false - when the buf is empty,or the check failed
-func (s *Stack[T]) Pop(check func(d T) bool) (data T, ok bool) {
+var ErrPopEmpty = errors.New("pop empty stack")
+var ErrPopCheckFailed = errors.New("pop stack check failed")
+
+// check func is used to check whether the next element can be popped,set nil if don't need it
+// if e == ErrPopCheckFailed the data will return but it will not be poped from the stack
+func (s *Stack[T]) Pop(check func(d T) bool) (data T, e error) {
 	for {
 		oldtop := s.top
 		if oldtop.pre == nil {
+			e = ErrPopEmpty
 			return
 		}
 		if check != nil && !check(oldtop.value) {
+			data = oldtop.value
+			e = ErrPopCheckFailed
 			return
 		}
 		if atomic.CompareAndSwapPointer((*unsafe.Pointer)(unsafe.Pointer(&s.top)), unsafe.Pointer(oldtop), unsafe.Pointer(oldtop.pre)) {
-			return oldtop.value, true
+			return oldtop.value, nil
 		}
 		runtime.Gosched()
 	}

rotatefile/rotatefile.go

@@ -92,7 +92,7 @@ func (f *RotateFile) run() {
 		}
 	}
 	write := func() bool {
-		if tmp, ok := f.caslist.Pop(nil); ok {
+		if tmp, e := f.caslist.Pop(nil); e == nil {
 			buf := tmp
 			if n, e := f.buffile.Write(buf); e != nil {
 				fmt.Println("[rotatefile.run] write error: " + e.Error())