From c98d15b0f242cff42f8114f03105b147a5a563c6 Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Tue, 12 Mar 2024 20:07:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20super=20=E5=8C=85=E6=96=B0=E5=A2=9E=20W?= =?UTF-8?q?aitGroup=20=E7=BB=93=E6=9E=84=EF=BC=8C=E7=94=A8=E6=B3=95?= =?UTF-8?q?=E5=90=8C=20sync.WaitGroup=EF=BC=8C=E5=8C=85=E5=90=AB=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=A2=9D=E5=A4=96=E7=9A=84=20Exec=20=E5=87=BD?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E7=94=A8=E4=BA=8E=E4=BE=BF=E6=8D=B7=E7=9A=84?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=BC=82=E6=AD=A5=E5=87=BD=E6=95=B0=E3=80=82?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=20stack.go=20=E7=9B=B8=E5=85=B3=E7=9A=84?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/super/stack.go | 53 -------------------------------------------- utils/super/wg.go | 24 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 53 deletions(-) delete mode 100644 utils/super/stack.go create mode 100644 utils/super/wg.go diff --git a/utils/super/stack.go b/utils/super/stack.go deleted file mode 100644 index 25ea97c..0000000 --- a/utils/super/stack.go +++ /dev/null @@ -1,53 +0,0 @@ -package super - -import ( - "runtime/debug" -) - -// NewStackGo 返回一个用于获取上一个协程调用的堆栈信息的收集器 -func NewStackGo() *StackGo { - return new(StackGo) -} - -// StackGo 用于获取上一个协程调用的堆栈信息 -// - 应当最先运行 Wait 函数,然后在其他协程中调用 Stack 函数或者 GiveUp 函数 -// - 适用于跨协程同步通讯,例如单线程的消息处理统计耗时打印堆栈信息 -type StackGo struct { - stack chan *struct{} // 消息堆栈 - collect chan []byte // 消息堆栈收集 -} - -// Wait 等待收集消息堆栈 -// - 在调用 Wait 函数后,当前协程将会被挂起,直到调用 Stack 或 GiveUp 函数 -func (slf *StackGo) Wait() { - slf.stack = make(chan *struct{}) - if s := <-slf.stack; s != nil { - slf.collect <- debug.Stack() - } - close(slf.stack) - slf.stack = nil -} - -// Stack 获取消息堆栈 -// - 在调用 Wait 函数后调用该函数,将会返回上一个协程的堆栈信息 -// - 在调用 GiveUp 函数后调用该函数,将会 panic -func (slf *StackGo) Stack() []byte { - if slf.stack == nil { - return nil - } - slf.collect = make(chan []byte, 1) - slf.stack <- &struct{}{} - stack := <-slf.collect - close(slf.collect) - slf.collect = nil - return stack -} - -// GiveUp 放弃收集消息堆栈 -// - 在调用 Wait 函数后调用该函数,将会放弃收集消息堆栈并且释放资源 -// - 在调用 GiveUp 函数后调用 Stack 函数,将会 panic -func (slf *StackGo) GiveUp() { - if slf.stack != nil { - slf.stack <- nil - } -} diff --git a/utils/super/wg.go b/utils/super/wg.go new file mode 100644 index 0000000..43cb7b7 --- /dev/null +++ b/utils/super/wg.go @@ -0,0 +1,24 @@ +package super + +import ( + "github.com/kercylan98/minotaur/utils/log" + "sync" +) + +type WaitGroup struct { + sync.WaitGroup +} + +func (w *WaitGroup) Exec(f func()) { + w.WaitGroup.Add(1) + go func(w *WaitGroup) { + defer func() { + w.WaitGroup.Done() + if err := RecoverTransform(recover()); err != nil { + log.Error("WaitGroup", log.Err(err)) + } + }() + + f() + }(w) +}