-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[NoQA] e2e: new common metrics (FPS, CPU, RAM) #43482
Changes from all commits
948253f
523ad7a
4ee79b7
ca8e0d1
e053fa6
eda73ca
f178843
eeaa464
7b1994b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
diff --git a/node_modules/@perf-profiler/android/dist/src/commands.js b/node_modules/@perf-profiler/android/dist/src/commands.js | ||
old mode 100755 | ||
new mode 100644 | ||
diff --git a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js | ||
index 77b9ee0..59aeed9 100644 | ||
--- a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js | ||
+++ b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js | ||
@@ -134,7 +134,20 @@ class UnixProfiler { | ||
} | ||
const subProcessesStats = (0, getCpuStatsByProcess_1.processOutput)(cpu, pid); | ||
const ram = (0, pollRamUsage_1.processOutput)(ramStr, this.getRAMPageSize()); | ||
- const { frameTimes, interval: atraceInterval } = frameTimeParser.getFrameTimes(atrace, pid); | ||
+ | ||
+ let output; | ||
+ try { | ||
+ output = frameTimeParser.getFrameTimes(atrace, pid); | ||
+ } catch (e) { | ||
+ console.error(e); | ||
+ } | ||
+ | ||
+ if (!output) { | ||
+ return; | ||
+ } | ||
+ | ||
+ const { frameTimes, interval: atraceInterval } = output; | ||
+ | ||
if (!initialTime) { | ||
initialTime = timestamp; | ||
} | ||
diff --git a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts | ||
index d6983c1..ccacf09 100644 | ||
--- a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts | ||
+++ b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts | ||
@@ -136,7 +136,19 @@ export abstract class UnixProfiler implements Profiler { | ||
const subProcessesStats = processOutput(cpu, pid); | ||
|
||
const ram = processRamOutput(ramStr, this.getRAMPageSize()); | ||
- const { frameTimes, interval: atraceInterval } = frameTimeParser.getFrameTimes(atrace, pid); | ||
+ | ||
+ let output; | ||
+ try { | ||
+ output = frameTimeParser.getFrameTimes(atrace, pid); | ||
+ } catch (e) { | ||
+ console.error(e); | ||
+ } | ||
+ | ||
+ if (!output) { | ||
+ return; | ||
+ } | ||
+ | ||
+ const { frameTimes, interval: atraceInterval } = output; | ||
|
||
if (!initialTime) { | ||
initialTime = timestamp; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
diff --git a/node_modules/@perf-profiler/reporter/dist/src/index.d.ts b/node_modules/@perf-profiler/reporter/dist/src/index.d.ts | ||
index 2f84d84..14ae688 100644 | ||
--- a/node_modules/@perf-profiler/reporter/dist/src/index.d.ts | ||
+++ b/node_modules/@perf-profiler/reporter/dist/src/index.d.ts | ||
@@ -4,4 +4,6 @@ export * from "./reporting/Report"; | ||
export * from "./utils/sanitizeProcessName"; | ||
export * from "./utils/round"; | ||
export * from "./reporting/cpu"; | ||
+export * from "./reporting/ram"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For that I created PR to upstream: bamlab/flashlight#294 |
||
+export * from "./reporting/fps"; | ||
export { canComputeHighCpuUsage } from "./reporting/highCpu"; | ||
diff --git a/node_modules/@perf-profiler/reporter/dist/src/index.js b/node_modules/@perf-profiler/reporter/dist/src/index.js | ||
index 4b50e3a..780963a 100644 | ||
--- a/node_modules/@perf-profiler/reporter/dist/src/index.js | ||
+++ b/node_modules/@perf-profiler/reporter/dist/src/index.js | ||
@@ -21,6 +21,8 @@ __exportStar(require("./reporting/Report"), exports); | ||
__exportStar(require("./utils/sanitizeProcessName"), exports); | ||
__exportStar(require("./utils/round"), exports); | ||
__exportStar(require("./reporting/cpu"), exports); | ||
+__exportStar(require("./reporting/fps"), exports); | ||
+__exportStar(require("./reporting/ram"), exports); | ||
var highCpu_1 = require("./reporting/highCpu"); | ||
Object.defineProperty(exports, "canComputeHighCpuUsage", { enumerable: true, get: function () { return highCpu_1.canComputeHighCpuUsage; } }); | ||
//# sourceMappingURL=index.js.map | ||
\ No newline at end of file |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,8 @@ const appPath = './android/app/build/outputs/apk/development/debug/app-developme | |
const config: Config = { | ||
MAIN_APP_PACKAGE: packageName, | ||
DELTA_APP_PACKAGE: packageName, | ||
BRANCH_MAIN: 'main', | ||
BRANCH_DELTA: 'main', | ||
MAIN_APP_PATH: appPath, | ||
DELTA_APP_PATH: appPath, | ||
Comment on lines
7
to
12
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is on purpose? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @hannojg yes. When we submit test result, then we specify
For |
||
RUNS: 8, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need this patch, or was that just for your debugging?
If we need it, we need an upstream issue + PR please
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hannojg I already created it bamlab/flashlight#291 but haven't received any comments yet 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah awesome - I think we should add this to the PR description !
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hannojg done 😊