From 85656a766c40bb9fa94afe651e4e0ac1f89ce4f4 Mon Sep 17 00:00:00 2001 From: Alexandre Moureaux Date: Thu, 6 Jun 2024 09:51:47 +0200 Subject: [PATCH] fix(profiler): fix ram usage when multiple pids (#290) * chore(cpp): change cmake min version * fix(profiler): ignore 255 error code * fix(profiler): fix ram usage when multiple pids * chore: fix ci after lerna config change --- package.json | 2 +- packages/platforms/android/cpp-profiler/CMakeLists.txt | 7 ++++--- .../platforms/android/src/commands/ram/pollRamUsage.ts | 2 +- packages/platforms/android/src/commands/shell.ts | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f271c178..01aa77e2 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "run-cli-example": "node packages/cli-example", "build": "rm -rf .parcel-cache && yarn clean-dist && tsc --build && yarn workspace @perf-profiler/web-reporter build && yarn workspace @perf-profiler/measure build", "release": "yarn build && lerna publish", - "test:e2e": "mkdir -p report && npx @perf-profiler/aws-device-farm runTest --apkPath .github/workflows/example.apk --projectName 'Flashlight-Serverless' --reportDestinationPath report --testCommand 'npx ts-node examples/e2e/appium-ci.test.ts' --testFolder .", + "test:e2e": "mkdir -p report && node packages/plugins/aws-device-farm/dist/bin.js runTest --apkPath .github/workflows/example.apk --projectName 'Flashlight-Serverless' --reportDestinationPath report --testCommand 'npx ts-node examples/e2e/appium-ci.test.ts' --testFolder .", "prepare": "husky" }, "homepage": "https://github.com/bamlab/flashlight#readme", diff --git a/packages/platforms/android/cpp-profiler/CMakeLists.txt b/packages/platforms/android/cpp-profiler/CMakeLists.txt index 6f1f20de..f8fbdfc6 100644 --- a/packages/platforms/android/cpp-profiler/CMakeLists.txt +++ b/packages/platforms/android/cpp-profiler/CMakeLists.txt @@ -1,5 +1,6 @@ -cmake_minimum_required(VERSION 3.16.0) +cmake_minimum_required(VERSION 3.22) project(android-cmake-flashlight) -add_executable(BAMPerfProfiler src/main.cpp src/atrace.cpp src/utils.cpp) -set(CMAKE_CXX_STANDARD 21) +set(CMAKE_CXX_STANDARD 17) + +add_executable(BAMPerfProfiler src/main.cpp src/atrace.cpp src/utils.cpp) diff --git a/packages/platforms/android/src/commands/ram/pollRamUsage.ts b/packages/platforms/android/src/commands/ram/pollRamUsage.ts index 103cd04b..f85519c4 100644 --- a/packages/platforms/android/src/commands/ram/pollRamUsage.ts +++ b/packages/platforms/android/src/commands/ram/pollRamUsage.ts @@ -1,7 +1,7 @@ const BYTES_PER_MB = 1024 * 1024; export const processOutput = (result: string, ramPageSize: number) => { - const lines = result.split("\n"); + const lines = result.split("\n").filter(Boolean); let total = 0; for (const line of lines) { diff --git a/packages/platforms/android/src/commands/shell.ts b/packages/platforms/android/src/commands/shell.ts index 13f26011..85a80745 100644 --- a/packages/platforms/android/src/commands/shell.ts +++ b/packages/platforms/android/src/commands/shell.ts @@ -74,6 +74,7 @@ export const executeAsync = ( 130, // SIGINT 140, // SIGKILL 143, // SIGTERM + 255, // SSH EXECUTION STOPPED ]; // SIGKILL or SIGTERM are likely to be normal, since we request termination from JS side