增加性能数据方法 (#37)

* 添加OpenglServer和SysmontapServer分别获取GPU/FPS/CPU/MEM相关数据 * 修复接收CPU数据uint64转换失败问题 * 添加GetPerfmon方法 * 增加获取系统网络上发/下载方法；todo GetPerfmon、iterFps、iterGPU、iterNetWork方法优化，增加单应用网络状态获取方法 * 增加單個應用網絡狀態監控 * 优化方法 * 优化输出流 * 优化方法 * 增加相关结束函数 * 增加参数类型 * 优化方法，开放CPU和MEM、系统FPS和GPU、系统networking性能数据相关方法 * 优化输出 * 优化输出 * 优化输出 * 优化输出 * 优化代码，隐藏iter方法 * 细节优化 * 优化，尝试关闭chan * 添加性能数据对应的实体类和输出数据的方法 * 初步确定优化方式，后续继续更改 * 优化性能数据 * toString方法优化 * 优化chan关闭 * 优化无参数时异常情况、优化实体类、优化测试方法 * 1.删除perfmorance包，性能数据struct放到instruments中，里面的性能数据struct删除ToString、ToJ…son、ToFormat方法 2.隐藏StopPerfmon方法，调用GetPerfmon返回的context.CancelFunc直接关闭 3.弃用PerfMonData通道处理数据，原始性能数据统一输送到interface通道里，由用户自行决定数据的处理 4.CPU、MEM优化异常PID信息提示 5.GetPerfmon参数优化，默认展示所有性能数据 6.fix cpu、mem plist Unknown parameter Co-authored-by: 奥利嗷嗷嗷叫 <53102695+alliaoaoo@users.noreply.github.com>
electricbubble · Aug 9, 2022 · 8bef4cc · 8bef4cc
1 parent 85d37bd
commit 8bef4cc
Show file tree

Hide file tree

Showing 6 changed files with 634 additions and 10 deletions.
diff --git a/device.go b/device.go
@@ -5,16 +5,15 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
-	"path"
-	"strings"
-	"time"
-
 	"github.com/electricbubble/gidevice/pkg/ipa"
 	"github.com/electricbubble/gidevice/pkg/libimobiledevice"
 	"github.com/electricbubble/gidevice/pkg/nskeyedarchiver"
 	uuid "github.com/satori/go.uuid"
 	"howett.net/plist"
+	"os"
+	"path"
+	"strings"
+	"time"
 )
 
 const LockdownPort = 62078
@@ -591,6 +590,133 @@ func (d *device) MoveCrashReport(hostDir string, opts ...CrashReportMoverOption)
 	return d.crashReportMover.Move(hostDir, opts...)
 }
 
+func (d *device) GetPerfmon(opts *PerfmonOption) (out chan interface{}, outCancel context.CancelFunc, perfErr error) {
+	if d.lockdown == nil {
+		if _, err := d.lockdownService(); err != nil {
+			return nil, nil, err
+		}
+	}
+	if opts==nil {
+		return nil, nil, fmt.Errorf("parameter is empty")
+	}
+	if !opts.OpenChanCPU &&!opts.OpenChanMEM &&!opts.OpenChanGPU &&!opts.OpenChanFPS &&!opts.OpenChanNetWork {
+		opts.OpenChanCPU = true
+		opts.OpenChanMEM = true
+		opts.OpenChanGPU = true
+		opts.OpenChanFPS = true
+		opts.OpenChanNetWork = true
+	}
+
+	var err error
+
+	var instruments Instruments
+	ctx, cancel := context.WithCancel(context.Background())
+
+	chanCPU := make(chan CPUInfo)
+	chanMEM := make(chan MEMInfo)
+	var cancelSysmontap context.CancelFunc
+
+	if opts.OpenChanCPU || opts.OpenChanMEM {
+		instruments, err = d.lockdown.InstrumentsService()
+		if err != nil {
+			return nil, cancel, err
+		}
+		chanCPU, chanMEM, cancelSysmontap, err = instruments.StartSysmontapServer(opts.PID, ctx)
+		if err != nil {
+			cancelSysmontap()
+			return nil, cancel, err
+		}
+	}
+
+	chanFPS := make(chan FPSInfo)
+	chanGPU := make(chan GPUInfo)
+	var cancelOpengl context.CancelFunc
+
+	if opts.OpenChanGPU || opts.OpenChanFPS {
+		instruments, err = d.lockdown.InstrumentsService()
+		if err != nil {
+			return nil, cancel, err
+		}
+		chanFPS, chanGPU, cancelOpengl, err = instruments.StartOpenglServer(ctx)
+		if err != nil {
+			cancelOpengl()
+			return nil, cancel, err
+		}
+	}
+
+	chanNetWork := make(chan NetWorkingInfo)
+	var cancelNetWork context.CancelFunc
+	if opts.OpenChanNetWork {
+		instruments, err = d.lockdown.InstrumentsService()
+		if err != nil {
+			return nil, cancel, err
+		}
+		chanNetWork, cancelNetWork, err = instruments.StartNetWorkingServer(ctx)
+		if err != nil {
+			cancelNetWork()
+			return nil, cancel, err
+		}
+	}
+	// 弃用之前的PerfMonData ，统一汇总到interface里，由用户自行决定处理数据
+	result := make(chan interface{})
+	go func() {
+		for {
+			select {
+			case v, ok := <-chanCPU:
+				if opts.OpenChanCPU && ok {
+					result<-v
+				}
+			case v, ok := <-chanMEM:
+				if opts.OpenChanMEM && ok {
+					result<-v
+				}
+			case v, ok := <-chanFPS:
+				if opts.OpenChanFPS && ok {
+					result<-v
+				}
+			case v, ok := <-chanGPU:
+				if opts.OpenChanGPU && ok {
+					result<-v
+				}
+			case v, ok := <-chanNetWork:
+				if opts.OpenChanNetWork && ok {
+					result<-v
+				}
+			case <-ctx.Done():
+				err:=d.stopPerfmon(opts)
+				if err!=nil {
+					fmt.Println(err)
+				}
+				close(result)
+				return
+			}
+		}
+	}()
+	return result, cancel, err
+}
+
+func (d *device)stopPerfmon(opts *PerfmonOption)(err error)  {
+	if _, err = d.instrumentsService(); err != nil {
+		return err
+	}
+	if opts.OpenChanCPU || opts.OpenChanMEM {
+		if err = d.instruments.StopSysmontapServer(); err != nil {
+			return err
+		}
+	}
+	if opts.OpenChanGPU || opts.OpenChanFPS {
+		if err = d.instruments.StopOpenglServer(); err != nil {
+			return err
+		}
+	}
+	if opts.OpenChanNetWork {
+		if err = d.instruments.StopNetWorkingServer(); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (d *device) XCTest(bundleID string, opts ...XCTestOption) (out <-chan string, cancel context.CancelFunc, err error) {
 	xcTestOpt := defaultXCTestOption()
 	for _, fn := range opts {
@@ -836,4 +962,4 @@ func (d *device) _uploadXCTestConfiguration(bundleID string, sessionId uuid.UUID
 	}
 
 	return
-}
+}
diff --git a/device_test.go b/device_test.go
@@ -1,6 +1,7 @@
 package giDevice
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"os/signal"
@@ -68,7 +69,7 @@ func Test_device_SavePairRecord(t *testing.T) {
 func Test_device_XCTest(t *testing.T) {
 	setupLockdownSrv(t)
 
-	bundleID = "com.leixipaopao.WebDriverAgentRunner.xctrunner"
+	bundleID = "com.DataMesh.CheckList"
 	out, cancel, err := dev.XCTest(bundleID)
 	// out, cancel, err := dev.XCTest(bundleID, WithXCTestEnv(map[string]interface{}{"USE_PORT": 8222, "MJPEG_SERVER_PORT": 8333}))
 	if err != nil {
@@ -154,6 +155,51 @@ func Test_device_Shutdown(t *testing.T) {
 	dev.Shutdown()
 }
 
+func Test_device_Perf(t *testing.T) {
+	//setupDevice(t)
+	//SetDebug(true,true)
+	setupLockdownSrv(t)
+
+	c := make(chan os.Signal)
+	signal.Notify(c, os.Interrupt, os.Kill)
+
+	var opts = &PerfmonOption{
+		//PID: "0",
+		//OpenChanNetWork: true,
+		//OpenChanFPS: true,
+		OpenChanMEM: true,
+		//OpenChanCPU: true,
+		//OpenChanGPU: true,
+	}
+
+	outData, cannel, err := dev.GetPerfmon(opts)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(0)
+	}
+	var timeLast = time.Now().Unix()
+	for  {
+		select {
+		case <-c:
+			if cannel!=nil {
+				cannel()
+			}
+		default:
+			data ,ok := <-outData
+			if !ok {
+				fmt.Println("end get perfmon data")
+				return
+			}
+			result, _ := json.MarshalIndent(data, "", "\t")
+			fmt.Println(string(result))
+			if time.Now().Unix()-timeLast >60 {
+				cannel()
+			}
+		}
+	}
+
+}
+
 func Test_device_InstallationProxyBrowse(t *testing.T) {
 	setupDevice(t)
 

diff --git a/idevice.go b/idevice.go
@@ -77,6 +77,8 @@ type Device interface {
 	springBoardService() (springBoard SpringBoard, err error)
 	GetIconPNGData(bundleId string) (raw *bytes.Buffer, err error)
 	GetInterfaceOrientation() (orientation OrientationState, err error)
+
+	GetPerfmon(opts *PerfmonOption) (out chan interface{}, outCancel context.CancelFunc, perfErr error)
 }
 
 type DeviceProperties = libimobiledevice.DeviceProperties
@@ -153,6 +155,19 @@ type Instruments interface {
 	// SysMonStart(cfg ...interface{}) (_ interface{}, err error)
 
 	registerCallback(obj string, cb func(m libimobiledevice.DTXMessageResult))
+
+	StartOpenglServer(ctx context.Context) (chanFPS chan FPSInfo, chanGPU chan GPUInfo, cancel context.CancelFunc, err error)
+
+	StopOpenglServer() (err error)
+
+	StartSysmontapServer(pid string, ctx context.Context) (chanCPU chan CPUInfo, chanMem chan MEMInfo, cancel context.CancelFunc, err error)
+
+	StopSysmontapServer() (err error)
+	//ProcessNetwork(pid int) (out <-chan interface{}, cancel context.CancelFunc, err error)
+
+	StartNetWorkingServer(ctx context.Context) (chanNetWorking chan NetWorkingInfo, cancel context.CancelFunc, err error)
+
+	StopNetWorkingServer() (err error)
 }
 
 type Testmanagerd interface {
@@ -357,6 +372,15 @@ func WithUpdateToken(updateToken string) AppListOption {
 	}
 }
 
+type PerfmonOption struct {
+	PID             string
+	OpenChanGPU     bool
+	OpenChanFPS     bool
+	OpenChanCPU     bool
+	OpenChanMEM     bool
+	OpenChanNetWork bool
+}
+
 type Process struct {
 	IsApplication bool      `json:"isApplication"`
 	Name          string    `json:"name"`