Add 自动生成pgo

diff --git a/.gitignore b/.gitignore
index c0b1b3cb61a0f52940bf3eed9c519dba8b1d6021..7c3cf3d20134f41c8f8fd2ccb4d73dd42e220ecd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ demo/coverage.txt
 coverage.txt
 demo/danmu.sqlite3
 plugin/*.go
+bili_danmu.go

diff --git a/Reply/F/genCpuPprof/genCpuPprof.go b/Reply/F/genCpuPprof/genCpuPprof.go
new file mode 100644 (file)
index 0000000..ba00915
--- /dev/null
+++ b/Reply/F/genCpuPprof/genCpuPprof.go
@@ -0,0 +1,31 @@
+package genCpuPprof
+
+import (
+       "context"
+       "runtime/pprof"
+
+       comp "github.com/qydysky/part/component"
+       pctx "github.com/qydysky/part/ctx"
+       pfile "github.com/qydysky/part/file"
+)
+
+var Start = comp.NewComp(start)
+
+func start(ctx context.Context, file string) error {
+       pgo := pfile.New(file, 0, false)
+       if pgo.IsExist() {
+               _ = pgo.Delete()
+       }
+       pgo.Create()
+       if err := pprof.StartCPUProfile(pgo.File()); err != nil {
+               return err
+       }
+       go func() {
+               ctx1, done1 := pctx.WaitCtx(ctx)
+               defer done1()
+               <-ctx1.Done()
+               pprof.StopCPUProfile()
+               pgo.Close()
+       }()
+       return nil
+}

diff --git a/bili_danmu.go b/bili_danmu.go
index fb7623c1e307e921437b2e2326e5d8e35ba2a7d1..c0b74ece45d6be211b2864971422fbee357bfdd3 100644 (file)
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -16,9 +16,11 @@ import (
        F "github.com/qydysky/bili_danmu/F"
        reply "github.com/qydysky/bili_danmu/Reply"
        "github.com/qydysky/bili_danmu/Reply/F/danmuReLiveTriger"
+       "github.com/qydysky/bili_danmu/Reply/F/genCpuPprof"
        "github.com/qydysky/bili_danmu/Reply/F/recStartEnd"
        send "github.com/qydysky/bili_danmu/Send"
        Cmd "github.com/qydysky/bili_danmu/cmd"
+       pctx "github.com/qydysky/part/ctx"
        sys "github.com/qydysky/part/sys"
 
        msgq "github.com/qydysky/part/msgq"
@@ -43,8 +45,16 @@ func Start() {
        var stop = sys.Sys().PreventSleep()
        defer stop.Done()
 
+       mainCtx, mainDone := pctx.WithWait(context.Background(), 0, time.Minute)
+       defer func() {
+               danmulog.L(`I: `, `等待协程结束`, time.Minute)
+               if e := mainDone(); e != nil {
+                       danmulog.L(`W: `, `等待退出超时`)
+               }
+       }()
+
        // 用户中断
-       var cancelInterrupt, interrupt_chan = c.C.Danmu_Main_mq.Pull_tag_chan(`interrupt`, 2, context.Background())
+       var cancelInterrupt, interrupt_chan = c.C.Danmu_Main_mq.Pull_tag_chan(`interrupt`, 2, mainCtx)
        defer cancelInterrupt()
 
        //ctrl+c退出
@@ -90,10 +100,10 @@ func Start() {
                // 附加功能 savetojson
                reply.SaveToJson.Init()
                // 指定房间录制区间
-               if err := recStartEnd.InitF.Run(context.Background(), c.C); err != nil {
+               if err := recStartEnd.InitF.Run(mainCtx, c.C); err != nil {
                        danmulog.Base("功能", "指定房间录制区间").L(`E: `, err)
                } else {
-                       _ = recStartEnd.LoopCheck.Run(context.Background(), recStartEnd.StreamCtl{
+                       _ = recStartEnd.LoopCheck.Run(mainCtx, recStartEnd.StreamCtl{
                                C:     c.C,
                                State: reply.StreamOStatus,
                                Start: reply.StreamOStart,
@@ -102,12 +112,18 @@ func Start() {
                        })
                }
                // 指定弹幕重启录制
-               if err := danmuReLiveTriger.Init.Run(context.Background(), danmuReLiveTriger.DanmuReLiveTriger{
+               if err := danmuReLiveTriger.Init.Run(mainCtx, danmuReLiveTriger.DanmuReLiveTriger{
                        StreamCut: reply.StreamOCut,
                        C:         c.C,
                }); err != nil {
                        danmulog.Base("功能", "指定弹幕重启录制").L(`E: `, err)
                }
+               // pgo gen
+               if file, ok := c.C.K_v.LoadV("生成pgo").(string); ok {
+                       if e := genCpuPprof.Start.Run(mainCtx, file); e != nil {
+                               danmulog.Base("功能", "生成pgo").L(`E: `, e)
+                       }
+               }
 
                //使用带tag的消息队列在功能间传递消息
                {
@@ -153,7 +169,7 @@ func Start() {
                for exitSign := false; !exitSign; {
                        if c.C.Roomid == 0 {
                                fmt.Println("回车查看指令")
-                               ctx, cancel := context.WithCancel(context.Background())
+                               ctx, cancel := context.WithCancel(mainCtx)
                                cancel1, c := c.C.Danmu_Main_mq.Pull_tag_chan(`change_room`, 1, ctx)
                                select {
                                case <-c:
@@ -246,7 +262,7 @@ func Start() {
                                        wsmsg.PushLock_tag(`send`, &ws.WsMsg{
                                                Msg: F.HelloGen(c.C.Roomid, c.C.Token),
                                        })
-                                       waitCheckAuth, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+                                       waitCheckAuth, cancel := context.WithTimeout(mainCtx, 5*time.Second)
                                        doneAuth := wsmsg.Pull_tag_only(`rec`, func(wm *ws.WsMsg) (disable bool) {
                                                if F.HelloChe(wm.Msg) {
                                                        cancel()
@@ -308,7 +324,7 @@ func Start() {
                                { //附加功能 进房间发送弹幕 直播流保存 每日签到
                                        go F.Dosign()
                                        go reply.Entry_danmu()
-                                       if e := recStartEnd.RecStartCheck.Run(context.Background(), c.C); e == nil {
+                                       if e := recStartEnd.RecStartCheck.Run(mainCtx, c.C); e == nil {
                                                go reply.StreamOStart(c.C.Roomid)
                                        } else {
                                                danmulog.Base("功能", "指定房间录制区间").L(`I: `, c.C.Roomid, e)
@@ -383,7 +399,7 @@ func Start() {
                                        })
 
                                        {
-                                               cancel, c := wsmsg.Pull_tag_chan(`exit`, 1, context.Background())
+                                               cancel, c := wsmsg.Pull_tag_chan(`exit`, 1, mainCtx)
                                                <-c
                                                cancel()
                                        }
@@ -400,6 +416,5 @@ func Start() {
                        reply.SaveToJson.Close()
                        reply.StreamOStop(-1)
                }
-               danmulog.L(`I: `, "结束退出")
        }
 }

diff --git a/demo/config/config_K_v.json b/demo/config/config_K_v.json
index a8e2cfec8f3d580c6431b27bdb9e1d0a98519169..2dc4e97bce7580148762030276fbb34958a99768 100644 (file)
--- a/demo/config/config_K_v.json
+++ b/demo/config/config_K_v.json
@@ -183,5 +183,7 @@
     "debug模式-help":"在/debug/pprof/启用调试",
     "debug模式":false,
     "性能路径-help":"当Web服务地址不为空时, 访问此路径可以获取性能信息，为空时关闭",
-    "性能路径":"/state"
+    "性能路径":"/state",
+    "生成pgo-help":"将在退出后生成pgo文件在指定路径,default.pgo将有助于下次构建的优化,但也会导致构建缓慢,为空时不生成",
+    "生成pgo":"default.pgo"
 }
\ No newline at end of file