1
0
mirror of https://github.com/fumiama/orbyte.git synced 2026-06-07 19:40:51 +08:00

feat: no panic on same goroutine

This commit is contained in:
源文雨
2025-04-14 23:01:07 +09:00
parent 162407d64e
commit b1efb0e49f
2 changed files with 46 additions and 12 deletions

28
item.go
View File

@@ -18,6 +18,10 @@ type Item[T any] struct {
cfg any cfg any
// align 64 // align 64
// id only take effect on issync = True
id int64
// align 64
val T val T
} }
@@ -36,7 +40,9 @@ func (b *Item[T]) Trans() T {
panic("use after destroy") panic("use after destroy")
} }
if b.pool.issync { if b.pool.issync {
b.stat.setinsyncop(true) if !b.stat.setinsyncop(true) {
panic("non-unique op")
}
} }
val := b.val val := b.val
atomic.StoreUintptr( atomic.StoreUintptr(
@@ -51,7 +57,10 @@ func (b *Item[T]) Trans() T {
// and will be Reset on putting back. // and will be Reset on putting back.
func (b *Item[T]) HasInvolved() bool { func (b *Item[T]) HasInvolved() bool {
if b.pool.issync { if b.pool.issync {
b.stat.setinsyncop(true) if !b.stat.setinsyncop(true) && getGoroutineID() != b.id {
panic("non-unique op")
}
atomic.StoreInt64(&b.id, getGoroutineID())
defer b.stat.setinsyncop(false) defer b.stat.setinsyncop(false)
} }
return b.stat.isbuffered() return b.stat.isbuffered()
@@ -65,7 +74,10 @@ func (b *Item[T]) V(f func(T)) {
panic("use after destroy") panic("use after destroy")
} }
if b.pool.issync { if b.pool.issync {
b.stat.setinsyncop(true) if !b.stat.setinsyncop(true) && getGoroutineID() != b.id {
panic("non-unique op")
}
atomic.StoreInt64(&b.id, getGoroutineID())
defer b.stat.setinsyncop(false) defer b.stat.setinsyncop(false)
} }
f(b.val) f(b.val)
@@ -80,7 +92,10 @@ func (b *Item[T]) P(f func(*T)) {
panic("use after destroy") panic("use after destroy")
} }
if b.pool.issync { if b.pool.issync {
b.stat.setinsyncop(true) if !b.stat.setinsyncop(true) && getGoroutineID() != b.id {
panic("non-unique op")
}
atomic.StoreInt64(&b.id, getGoroutineID())
defer b.stat.setinsyncop(false) defer b.stat.setinsyncop(false)
} }
f(&b.val) f(&b.val)
@@ -93,7 +108,10 @@ func (b *Item[T]) Copy() (cb *Item[T]) {
panic("use after destroy") panic("use after destroy")
} }
if b.pool.issync { if b.pool.issync {
b.stat.setinsyncop(true) if !b.stat.setinsyncop(true) && getGoroutineID() != b.id {
panic("non-unique op")
}
atomic.StoreInt64(&b.id, getGoroutineID())
defer b.stat.setinsyncop(false) defer b.stat.setinsyncop(false)
} }
cb = b.pool.New(b.cfg) cb = b.pool.New(b.cfg)

View File

@@ -1,6 +1,11 @@
package orbyte package orbyte
import "sync/atomic" import (
"runtime"
"strconv"
"strings"
"sync/atomic"
)
const ( const (
statusisbuffered = 1 << iota statusisbuffered = 1 << iota
@@ -16,6 +21,16 @@ func init() {
destroyedstatus.setdestroyed(true) destroyedstatus.setdestroyed(true)
} }
func getGoroutineID() int64 {
var buf [64]byte
n := runtime.Stack(buf[:], false)
idField := strings.Fields(string(buf[:n]))[1]
id, err := strconv.ParseInt(idField, 10, 64)
if err != nil {
panic(err)
}
return id
}
func (c status) mask(v bool, typ uintptr) (news status) { func (c status) mask(v bool, typ uintptr) (news status) {
news = c news = c
if v { if v {
@@ -39,22 +54,23 @@ func (c *status) setbool(v bool, typ uintptr) {
} }
} }
// setboolunique panic on non-unique set // setboolunique return false on non-unique set
func (c *status) setboolunique(v bool, typ uintptr) { func (c *status) setboolunique(v bool, typ uintptr) bool {
olds := atomic.LoadUintptr((*uintptr)(c)) olds := atomic.LoadUintptr((*uintptr)(c))
oldv := olds&typ != 0 oldv := olds&typ != 0
if oldv == v { if oldv == v {
panic("non-unique operation") return false
} }
news := status(olds).mask(v, typ) news := status(olds).mask(v, typ)
for !atomic.CompareAndSwapUintptr((*uintptr)(c), olds, uintptr(news)) { for !atomic.CompareAndSwapUintptr((*uintptr)(c), olds, uintptr(news)) {
olds = atomic.LoadUintptr((*uintptr)(c)) olds = atomic.LoadUintptr((*uintptr)(c))
oldv = olds&typ != 0 oldv = olds&typ != 0
if oldv == v { if oldv == v {
panic("non-unique operation") return false
} }
news = status(olds).mask(v, typ) news = status(olds).mask(v, typ)
} }
return true
} }
func (c *status) loadbool(typ uintptr) bool { func (c *status) loadbool(typ uintptr) bool {
@@ -77,6 +93,6 @@ func (c *status) setdestroyed(v bool) {
c.setbool(v, statusdestroyed) c.setbool(v, statusdestroyed)
} }
func (c *status) setinsyncop(v bool) { func (c *status) setinsyncop(v bool) bool {
c.setboolunique(v, statusinsyncop) return c.setboolunique(v, statusinsyncop)
} }