diff --git a/archive.go b/archive.go index 29bdc8a..45a51e0 100644 --- a/archive.go +++ b/archive.go @@ -5,14 +5,12 @@ import ( "os" "path/filepath" "time" - - "b612.me/starmap" ) -var archMap starmap.StarMapKV +var archMap starMapKV func init() { - archMap = starmap.NewStarMap() + archMap = newStarMap() } type Archive interface { diff --git a/go.mod b/go.mod index 9e82564..22c8f17 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,4 @@ module b612.me/starlog go 1.16 -require ( - b612.me/starmap v1.2.4 - golang.org/x/sys v0.18.0 -) +require golang.org/x/sys v0.24.0 diff --git a/go.sum b/go.sum index 80908db..d88e7bd 100644 --- a/go.sum +++ b/go.sum @@ -1,55 +1,2 @@ -b612.me/notify v1.2.5 h1:fASpzi8YAo78g6jKnefzfbsQz0nGNYFbClB2Bylj+MA= -b612.me/notify v1.2.5/go.mod h1:GTnAdC6v9krGxtC8Gkn8TcyUsYnHSiHjRAXsONPiLpI= -b612.me/starcrypto v0.0.3 h1:lBGtz0kBdsV198BDQ72zBgOXYKBCb47R9tCWP/PFIwA= -b612.me/starcrypto v0.0.3/go.mod h1:pF5A16p8r/h1G0x7ZNmmAF6K1sdIMpbCUxn2WGC8gZ0= -b612.me/stario v0.0.9 h1:bFDlejUJMwZ12a09snZJspQsOlkqpDAl9qKPEYOGWCk= -b612.me/stario v0.0.9/go.mod h1:x4D/x8zA5SC0pj/uJAi4FyG5p4j5UZoMEZfvuRR6VNw= -b612.me/starmap v1.2.4 h1:gfAyBtzW3KKCIyI14I2pEqGsR/u2E+3tkH0xRqtWb4E= -b612.me/starmap v1.2.4/go.mod h1:EhOUzkItc5IcyBmr1C7/vmZBbW3GgCWs63hGn7WhuMc= -b612.me/starnet v0.1.8 h1:sTNytUFP38i2BFR9nha3lTSLYb7El3tvKpZplYCrhZk= -b612.me/starnet v0.1.8/go.mod h1:k862Kf8DiVWTqdX6PHTFb6NoT+3G3Y74n8NCyNhuP0Y= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= diff --git a/stacks.go b/stacks.go new file mode 100644 index 0000000..2d1e27a --- /dev/null +++ b/stacks.go @@ -0,0 +1,149 @@ +package starlog + +import ( + "errors" + "io" + "os" + "sync" + "sync/atomic" +) + +type starMapKV struct { + kvMap map[interface{}]interface{} + mu sync.RWMutex +} + +func newStarMap() starMapKV { + var mp starMapKV + mp.kvMap = make(map[interface{}]interface{}) + return mp +} + +func (m *starMapKV) Get(key interface{}) (interface{}, error) { + var err error + m.mu.RLock() + defer m.mu.RUnlock() + data, ok := m.kvMap[key] + if !ok { + err = os.ErrNotExist + } + return data, err +} + +func (m *starMapKV) MustGet(key interface{}) interface{} { + result, _ := m.Get(key) + return result +} + +func (m *starMapKV) Store(key interface{}, value interface{}) error { + m.mu.Lock() + defer m.mu.Unlock() + m.kvMap[key] = value + return nil +} + +func (m *starMapKV) Exists(key interface{}) bool { + m.mu.RLock() + defer m.mu.RUnlock() + _, ok := m.kvMap[key] + return ok +} + +func (m *starMapKV) Delete(key interface{}) error { + m.mu.Lock() + defer m.mu.Unlock() + delete(m.kvMap, key) + return nil +} + +func (m *starMapKV) Range(run func(k interface{}, v interface{}) bool) error { + for k, v := range m.kvMap { + if !run(k, v) { + break + } + } + return nil +} + +type starChanStack struct { + data chan interface{} + cap uint64 + current uint64 + isClose atomic.Value +} + +func newStarChanStack(cap uint64) *starChanStack { + rtnBuffer := new(starChanStack) + rtnBuffer.cap = cap + rtnBuffer.isClose.Store(false) + rtnBuffer.data = make(chan interface{}, cap) + return rtnBuffer +} + +func (s *starChanStack) init() { + s.cap = 1024 + s.data = make(chan interface{}, s.cap) + s.isClose.Store(false) +} + +func (s *starChanStack) Free() uint64 { + return s.cap - s.current +} + +func (s *starChanStack) Cap() uint64 { + return s.cap +} + +func (s *starChanStack) Len() uint64 { + return s.current +} + +func (s *starChanStack) Pop() (interface{}, error) { + if s.isClose.Load() == nil { + s.init() + } + if s.isClose.Load().(bool) { + return 0, io.EOF + } + data, ok := <-s.data + if !ok { + s.isClose.Store(true) + return 0, errors.New("channel read error") + } + for { + current := atomic.LoadUint64(&s.current) + if atomic.CompareAndSwapUint64(&s.current, current, current-1) { + break + } + } + return data, nil +} + +func (s *starChanStack) Push(data interface{}) error { + defer func() { + recover() + }() + if s.isClose.Load() == nil { + s.init() + } + if s.isClose.Load().(bool) { + return io.EOF + } + s.data <- data + for { + current := atomic.LoadUint64(&s.current) + if atomic.CompareAndSwapUint64(&s.current, current, current+1) { + break + } + } + return nil +} + +func (s *starChanStack) Close() error { + if s.isClose.Load() == nil { + s.init() + } + s.isClose.Store(true) + close(s.data) + return nil +} diff --git a/typed.go b/typed.go index dee241d..c8c7be5 100644 --- a/typed.go +++ b/typed.go @@ -8,7 +8,6 @@ import ( "time" "b612.me/starlog/colorable" - "b612.me/starmap" ) const ( @@ -33,7 +32,7 @@ var ( LvPanic: "PANIC", LvFatal: "FATAL", } - stacks *starmap.StarChanStack + stacks *starChanStack stackStarted bool = false stackStopChan chan int stackMu sync.Mutex @@ -184,7 +183,7 @@ func StartStacks() { unlock := make(chan struct{}) go func() { stackStarted = true - stacks = starmap.NewStarChanStack(1024) + stacks = newStarChanStack(1024) stackMu.Unlock() unlock <- struct{}{} defer func() {