From e0cd3010335299d5e707e75651346c6fdc5ac1ad Mon Sep 17 00:00:00 2001 From: chenhq Date: Thu, 30 May 2024 11:42:36 +0800 Subject: [PATCH] fix #280 --- README.md | 2 +- README.zh.md | 7 +- setup.cfg | 6 +- solox/__init__.py | 2 +- solox/__main__.py | 6 +- solox/public/apm.py | 49 +++++++--- solox/public/common.py | 1 + solox/public/report_template/android.html | 8 +- solox/public/report_template/ios.html | 8 +- solox/templates/analysis.html | 6 +- solox/templates/base.html | 9 +- solox/templates/index.html | 111 +++++++++++++++++++--- solox/templates/pk.html | 22 ++--- solox/view/apis.py | 19 +++- 14 files changed, 195 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 172b490..10460bd 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

-SoloX +SoloX

diff --git a/README.zh.md b/README.zh.md index 7f62868..bae109d 100644 --- a/README.zh.md +++ b/README.zh.md @@ -4,7 +4,7 @@

-SoloX +SoloX

@@ -62,8 +62,7 @@ python -m solox --host={ip} --port={port} ## 🏴󠁣󠁩󠁣󠁭󠁿使用python收集 ```python -an -# solox version : >= 2.8.5 +# solox version : >= 2.9.0 from solox.public.apm import AppPerformanceMonitor from solox.public.common import Devices @@ -81,7 +80,7 @@ apm = AppPerformanceMonitor(pkgName='com.bilibili.app.in',platform='Android', de cpu = apm.collectCpu() # % memory = apm.collectMemory() # MB memory_detail = apm.collectMemoryDetail() # MB -network = apm.collectNetwork(wifi=True) # KB , wifi=False时是收集移动网络，手机要切换数据流量 +network = apm.collectNetwork(wifi=True) # KB , wifi=False时是收集移动数据流量，手机会自动关闭wifi切换到移动网络 fps = apm.collectFps() # HZ battery = apm.collectBattery() # level:% temperature:°C current:mA voltage:mV power:w gpu = apm.collectGpu() # % 安卓只支持高通芯片的手机 diff --git a/setup.cfg b/setup.cfg index bcfeb0b..4da765a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,7 +2,7 @@ name = solox author = Rafa Chen author_email = rafacheninc@gamil.com -summary = tool for apm +summary = tool for app performance license = MIT home_page = https://github.com/smart-test-ti/SoloX description_file = README.md @@ -12,6 +12,10 @@ classifier = Operating System :: OS Independent Programming Language :: Python :: 3 +[files] +packages = + solox + [entry_points] console_scripts = solox = solox.__main__:main \ No newline at end of file diff --git a/solox/__init__.py b/solox/__init__.py index e73a11a..ddbfd7c 100644 --- a/solox/__init__.py +++ b/solox/__init__.py @@ -2,4 +2,4 @@ from __future__ import absolute_import -__version__ = '2.9.0' +__version__ = '2.9.1' diff --git a/solox/__main__.py b/solox/__main__.py index 1a008c2..e15670d 100644 --- a/solox/__main__.py +++ b/solox/__main__.py @@ -2,6 +2,8 @@ from logzero import logger import platform import fire as fire +# import argparse +from solox import __version__ def checkPyVer(): versions = platform.python_version().split('.') @@ -12,7 +14,9 @@ def checkPyVer(): return True if __name__ == '__main__': + # ap = argparse.ArgumentParser( + # formatter_class=argparse.ArgumentDefaultsHelpFormatter) check = checkPyVer() if check: from solox.web import main - fire.Fire(main) + fire.Fire(main) \ No newline at end of file diff --git a/solox/public/apm.py b/solox/public/apm.py index bb30f0d..b58d781 100644 --- a/solox/public/apm.py +++ b/solox/public/apm.py @@ -59,31 +59,56 @@ def getTotalCpuStat(self): for i in range(1, 8): totalCpu += float(toks[i]) return float(totalCpu) - - def getSysCpuStat(self): - """get the total cpu usage at a certain time""" + + def getCpuCoreStat(self): + """get the core cpu usage at a certain time""" cmd = 'cat /proc/stat |{} ^cpu'.format(d.filterType()) result = adb.shell(cmd=cmd, deviceId=self.deviceId) - r = re.compile(r'(? APP - +
Platform - +
Device - +
CTime - +
diff --git a/solox/public/report_template/ios.html b/solox/public/report_template/ios.html index 5dc63ed..388a7b3 100644 --- a/solox/public/report_template/ios.html +++ b/solox/public/report_template/ios.html @@ -23,25 +23,25 @@ APP - +
Platform - +
Device - +
CTime - +
diff --git a/solox/templates/analysis.html b/solox/templates/analysis.html index 9ab0f2a..2a2d2b7 100644 --- a/solox/templates/analysis.html +++ b/solox/templates/analysis.html @@ -543,7 +543,7 @@ {% if apm_data.disk_flag == True %}
-
{% if lan == 'cn' %} 磁盘使用 (MB) {% else %} Disk Usage (KB) {% endif %}
+
{% if lan == 'cn' %} 磁盘 (KB) {% else %} Disk Usage (KB) {% endif %}
@@ -562,7 +562,7 @@
{% endif %}
- +{% if platform == 'Android'%}
@@ -700,7 +700,7 @@

- +{% endif %}
@@ -385,6 +389,7 @@

netdataRecvWarning:parseInt($('#down_warning_value').val()), netdataSendWarning:parseInt($('#upflow_warning_value').val()), betteryWarning:parseInt($('#battery_warning_value').val()), + gpuWarning:parseInt($('#gpu_warning_value').val()), duration:parseInt($('#duration').val()), solox_host: $('#host').val(), host_switch:host_switch diff --git a/solox/templates/index.html b/solox/templates/index.html index 481f947..7288ac1 100644 --- a/solox/templates/index.html +++ b/solox/templates/index.html @@ -160,7 +160,7 @@

{% if lan == 'cn' %} 基础信息 {% else %} Base In {% if platform == 'Android' %} {% endif %} @@ -266,20 +266,21 @@
{% if lan == 'cn' %} 基础信息 {% else %} Base In
-
+
{% if platform == 'Android' %} -
- + +
+
-
+
{% else %} -
-
-
+
+
+
{% endif %} -
-
- +
+
+
@@ -400,12 +401,28 @@
Add More
var stop = false; // 任务状态 + // var cores_num = cpucoreNum(); + function ruteCheck(){ if(['Android','iOS'].indexOf(platform) === -1 || platform && ['cn','en'].indexOf(lan) === -1 && lan){ this.location.href = '/?platform=Android&lan=en'; } } + function cpucoreNum(){ + var num ; + $.ajax({ + url: Host + "/device/cpucore", + type: "GET", + async: false, + cache: false, + success: function (data) { + num = data['num'] + } + }); + return num + } + $(document).ready(function() { ruteCheck(); @@ -431,7 +448,7 @@
Add More
$('.select-device').change(function() { $.ajax({ - url: Host + "/device/packagenames", + url: Host + "/device/package", type: "GET", async: true, cache: false, @@ -541,7 +558,7 @@
Add More
function initializeEnv(){ $.ajax({ - url: Host + "/device/ids?platform="+platform, + url: Host + "/device/info?platform="+platform, type: "GET", async: true, cache: false, @@ -1035,6 +1052,26 @@
Add More
} }); } + + function initCpuCoresSeries(){ + var cores_array = new Array() + try{ + console.log(cores_num) + if(cores_num > 0){ + var array = Array.from({ length: cores_num }, (_, i) => i) + array.forEach(element => { + cores_array.push('cpu'+element.toString()) + }) + }else{ + cores_array = ['cpu0','cpu1','cpu2','cpu3','cpu4','cpu5','cpu6','cpu7'] + } + } + catch{ + cores_array = ['cpu0','cpu1','cpu2','cpu3','cpu4','cpu5','cpu6','cpu7'] + } + console.log(cores_array) + return cores_array + } var rangeSelector = { buttons: [{ @@ -1069,6 +1106,27 @@
Add More
}()) }]; + // var seriesCpuCore = new Array() + + // initCpuCoresSeries().forEach(element => { + // seriesCpuCore.push({ + // name : element, + // pointInterval: 120 * 1000, + // data : (function () { + // var data = [], time = (new Date()).getTime(), i; + // for (i = -999; i <= 0; i += 1) { + // data.push([ + // time + i * 1000, + // Math.round(0) + // ]); + // } + // return data; + // }()) + // }) + // }) + + // console.log(seriesCpuCore) + var seriesNet = [{ name : 'send', pointInterval: 120 * 1000, @@ -1420,6 +1478,9 @@
Add More
case 'downflow': value = parseInt($('#down_warning_value').val()); break; + case 'gpu': + value = parseInt($('#gpu_warning_value').val()); + break; } var plotLines = []; @@ -1470,11 +1531,21 @@
Add More
legend = true; yAxis = yAxis_plot; break; + case 'cpu_core': + seriesFinal = seriesCpuCore; + legend = true; + yAxis = yAxis_plot; + break; case 'disk': seriesFinal = seriesDisk; legend = true; yAxis = yAxis_plot; - break; + break; + case 'gpu': + seriesFinal = series; + legend = true; + yAxis = yAxis_plot; + break; case 'mem_android': seriesFinal = seriesMem; legend = true; @@ -1531,6 +1602,12 @@
Add More
return cpu_chart } + // function cpucoreInitialize(){ + // let type = 'cpu_core'; + // let cpucore_chart = chartsInitialize(type,'CPU Core Usage (%)'); + // return cpucore_chart + // } + function batteryInitialize(){ let type = platform == 'Android' ? 'battery_android' : 'battery_ios'; let battery_chart = chartsInitialize(type,'Battery'); @@ -1578,6 +1655,7 @@
Add More
} var cpu_chart = cpuInitialize(); + // var cpucore_chart = cpucoreInitialize() var mem_chart = memInitialize(); var mem_detail_chart = memDetailInitialize(); var network_chart = networkInitialize(); @@ -1619,6 +1697,11 @@
Add More
yAxis = yAxis_plot; legend = true; break; + case 'cpu_core': + seriesFinal = seriesCpuCore; + yAxis = yAxis_plot; + legend = true; + break; case 'disk': seriesFinal = seriesDisk; yAxis = yAxis_plot; diff --git a/solox/templates/pk.html b/solox/templates/pk.html index 7c2abe7..aec1dd4 100644 --- a/solox/templates/pk.html +++ b/solox/templates/pk.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% block title %}SoloX - {% if lan == 'cn' %} 比对模式 {% else %} PK Model {% endif %}{% endblock %} +{% block title %}SoloX - {% if lan == 'cn' %} 比对模式 {% else %} PK Mode {% endif %}{% endblock %} {% block css %}{% endblock %} @@ -79,14 +79,14 @@
{% if lan == 'cn' %} 设备信息 {% else %} Device 1
- +
2
- +
{% if lan == 'cn' %} 包名 {% else %} Package Name {% endif %}
@@ -102,14 +102,14 @@
{% if lan == 'cn' %} 包名 {% else %} Package Name 1 - +
2
- +
{% if lan == 'cn' %} 包名 {% else %} Package Name {% endif %}
@@ -139,10 +139,10 @@
{% if lan == 'cn' %} 性能指标 {% else %} APM Tar
-
-
-
-
+
+
+
+
@@ -197,7 +197,7 @@
{% if lan == 'cn' %} 性能指标 {% else %} APM Tar function getPkgnames(device,element){ $.ajax({ - url: "/device/packagenames", + url: "/device/package", type: "GET", async: true, cache: false, @@ -224,7 +224,7 @@
{% if lan == 'cn' %} 性能指标 {% else %} APM Tar function initializeEnv(model){ $.ajax({ - url: "/device/ids?platform=Android", + url: "/device/info?platform=Android", type: "GET", async: true, cache: false, diff --git a/solox/view/apis.py b/solox/view/apis.py index d8bc3ca..99db5d3 100644 --- a/solox/view/apis.py +++ b/solox/view/apis.py @@ -25,6 +25,7 @@ def setCookie(): netdataRecvWarning = request.args.get('netdataRecvWarning') netdataSendWarning = request.args.get('netdataSendWarning') betteryWarning = request.args.get('betteryWarning') + gpuWarning = request.args.get('gpuWarning') duration = request.args.get('duration') solox_host = request.args.get('solox_host') host_switch = request.args.get('host_switch') @@ -36,6 +37,7 @@ def setCookie(): resp.set_cookie('netdataRecvWarning', netdataRecvWarning) resp.set_cookie('netdataSendWarning', netdataSendWarning) resp.set_cookie('betteryWarning', betteryWarning) + resp.set_cookie('gpuWarning', gpuWarning) resp.set_cookie('duration', duration) resp.set_cookie('solox_host', solox_host) resp.set_cookie('host_switch', host_switch) @@ -63,8 +65,8 @@ def initialize(): result = {'status': 0, 'msg': str(e)} return result -@api.route('/device/ids', methods=['post', 'get']) -def deviceids(): +@api.route('/device/info', methods=['post', 'get']) +def deviceinfo(): """get devices info""" platform = method._request(request, 'platform') try: @@ -101,7 +103,18 @@ def deviceids(): result = {'status': 0, 'msg': 'devices connect error!'} return result -@api.route('/device/packagenames', methods=['post', 'get']) +@api.route('/device/cpucore', methods=['post', 'get']) +def cpucore(): + try: + deviceId = d.getDeviceIds()[0] + num = d.getCpuCores(deviceId) + result = {'status': 1, 'num': num} + except Exception as e: + result = {'status': 1, 'num': 0} + return result + + +@api.route('/device/package', methods=['post', 'get']) def packageNames(): """get devices packageNames""" platform = method._request(request, 'platform')