browsertime 17.2.0 → 17.3.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Browsertime changelog (we do [semantic versioning](https://semver.org))
 
+## 17.3.0 - 2022-03-26
+
+### Fixed
+* Bumped Selenium-webdriver to 4.8.2 [#1916](https://github.com/sitespeedio/browsertime/pull/1916).
+
+### Added
+* On Linux you can use taskset to assing FFMPEG to specific CPUs using `--videoParams.taskset "0,5,7,9-11" `. It will start FFMPEG with `taskset -c <CPUS>` to pin FFMPG to specific CPU(s). Specify a numerical list of processors. The list may contain multiple items, separated by comma, and ranges. For example, "0,5,7,9-11". Use it together with isolcpus. Added in [#1917](https://github.com/sitespeedio/browsertime/pull/1917).
+## 17.2.1 - 2022-03-16
+### Fixed
+* Bumped Geckodriver to 0.32.2 and Edgedriver to 111.
 
 ## 17.2.0 - 2022-03-14
 ### Added 

package/lib/android/root.js

@@ -12,8 +12,15 @@ const animationsToStop = [
 ];
 
 export class RootedDevice {
-  constructor(androidClient) {
+  constructor(androidClient, options) {
     this.client = androidClient;
+    this.options = options;
+  }
+
+  async _setCPU(freq, policy, type) {
+    return this.client._runAsRoot(
+      `echo ${freq} > /sys/devices/system/cpu/cpufreq/policy${policy}/scaling_${type}_freq`
+    );
   }
 
   async stopServices() {
@@ -85,7 +92,7 @@ export class RootedDevice {
 
   async setCPUPerformanceSamsungA51() {
     // Octa-core (4x2.3 GHz Cortex-A73 & 4x1.7 GHz Cortex-A53)
-    // See values by
+    // See values by:
     // cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies
     // cat /sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies
 
@@ -97,13 +104,79 @@ export class RootedDevice {
       'echo performance > /sys/devices/system/cpu/cpufreq/policy4/scaling_governor'
     );
 
-    await this.client._runAsRoot(
-      'echo 1742000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq'
-    );
+    // For the Samsung A51 we can choose min/middle or max CPU speed
 
-    return this.client._runAsRoot(
-      'echo 2314000 > /sys/devices/system/cpu/cpufreq/policy4/scaling_min_freq'
+    // Collect the current settings
+    const currentMaxPolicy0 = await this.client._runAsRootAndGet(
+      'cat /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq'
+    );
+    const currentMinPolicy0 = await this.client._runAsRootAndGet(
+      'cat /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq'
+    );
+    const currentMaxPolicy4 = await this.client._runAsRootAndGet(
+      'cat /sys/devices/system/cpu/cpufreq/policy4/scaling_max_freq'
+    );
+    const currentMinPolicy4 = await this.client._runAsRootAndGet(
+      'cat /sys/devices/system/cpu/cpufreq/policy4/scaling_min_freq'
     );
+
+    if (this.options.androidPinCPUSpeed === 'min') {
+      log.info('Set min CPU speed');
+
+      // The min settings, see the possible slowest setting by
+      // cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies
+      const minPolicy0 = 403_000;
+      const minPolicy4 = 936_000;
+
+      // You need to set them in the correct order
+      if (Number(currentMinPolicy0) > minPolicy0) {
+        await this._setCPU(minPolicy0, '0', 'min');
+        await this._setCPU(minPolicy0, '0', 'max');
+      } else {
+        await this._setCPU(minPolicy0, '0', 'max');
+        await this._setCPU(minPolicy0, '0', 'min');
+      }
+
+      if (Number(currentMinPolicy4) > minPolicy4) {
+        await this._setCPU(minPolicy4, '4', 'min');
+        return this._setCPU(minPolicy4, '4', 'max');
+      } else {
+        await this._setCPU(minPolicy4, '4', 'max');
+        return this._setCPU(minPolicy4, '4', 'min');
+      }
+    } else if (this.options.androidPinCPUSpeed === 'middle') {
+      log.info('Set middle CPU speed');
+
+      const middlePolicy0 = 910_000;
+      const middlePolicy4 = 1_508_000;
+
+      if (Number(currentMaxPolicy0) > middlePolicy0) {
+        await this._setCPU(middlePolicy0, '0', 'min');
+        await this._setCPU(middlePolicy0, '0', 'max');
+      } else {
+        await this._setCPU(middlePolicy0, '0', 'max');
+        await this._setCPU(middlePolicy0, '0', 'min');
+      }
+
+      if (Number(currentMaxPolicy4) > middlePolicy4) {
+        await this._setCPU(middlePolicy4, '4', 'min');
+        return this._setCPU(middlePolicy4, '4', 'max');
+      } else {
+        await this._setCPU(middlePolicy4, '4', 'max');
+        return this._setCPU(middlePolicy4, '4', 'min');
+      }
+    } else {
+      log.info('Set max CPU speed');
+
+      const maxPolicy0 = 1_742_000;
+      const maxPolicy4 = 2_314_000;
+
+      // set it to max speed
+      await this._setCPU(maxPolicy0, '0', 'max');
+      await this._setCPU(maxPolicy0, '0', 'min');
+      await this._setCPU(maxPolicy4, '4', 'max');
+      return this._setCPU(maxPolicy4, '4', 'min');
+    }
   }
 
   async setCPUPerformancePixel2() {

package/lib/core/engine/index.js

@@ -131,7 +131,7 @@ export class Engine {
         if (gotRoot.includes('not found')) {
           log.info('Your phone do not have su, is it really rooted?');
         } else {
-          this.rooted = new RootedDevice(this.android);
+          this.rooted = new RootedDevice(this.android, options);
           await this.rooted.start();
         }
       }

package/lib/support/cli.js

@@ -638,6 +638,11 @@ export function parseCommandLine() {
         'Use nice when running FFMPEG during the run. A value from -20 to 19  https://linux.die.net/man/1/nice',
       group: 'video'
     })
+    .option('videoParams.taskset', {
+      describe:
+        'Start FFMPEG with taskset -c <CPUS> to pin FFMPG to specific CPU(s). Specify a numerical list of processors. The list may contain multiple items, separated by comma, and ranges. For example, "0,5,7,9-11".',
+      group: 'video'
+    })
     .option('videoParams.convert', {
       type: 'boolean',
       default: true,
@@ -715,6 +720,14 @@ export function parseCommandLine() {
         'If your phone is rooted you can use this to set it up following Mozillas best practice for stable metrics.',
       group: 'android'
     })
+    .option('android.pinCPUSpeed', {
+      alias: 'androidPinCPUSpeed',
+      choices: ['min', 'middle', 'max'],
+      default: 'min',
+      describe:
+        'Using a Samsung A51 you can choose how to pin the CPU to better align the speed with your users',
+      group: 'android'
+    })
     .option('android.batteryTemperatureLimit', {
       alias: 'androidBatteryTemperatureLimit',
       type: 'integer',

package/lib/video/screenRecording/desktop/desktopRecorder.js

@@ -25,6 +25,7 @@ export class DesktopRecorder {
     this.convert = get(options, 'videoParams.convert', _convert);
     this.threads = get(options, 'videoParams.threads', _threads);
     this.viewPort = getViewPort(options);
+    this.taskset = get(options, 'videoParams.taskset');
     this.origin = '0,0';
     this.offset = { x: 0, y: 0 };
     this.options = options;
@@ -42,7 +43,8 @@ export class DesktopRecorder {
       framerate: this.framerate,
       crf: this.crf,
       nice: this.nice,
-      threads: this.threads
+      threads: this.threads,
+      taskset: this.taskset
     });
 
     return this.recording;

package/lib/video/screenRecording/desktop/ffmpegRecorder.js

@@ -84,7 +84,7 @@ async function buildX11FfmpegArguments({
   }
 }
 
-async function startRecording(ffmpegArguments, nice, filePath) {
+async function startRecording(ffmpegArguments, nice, taskset, filePath) {
   async function waitForRecording(readableStream) {
     return new Promise((resolve, reject) => {
       readableStream.on('data', data => {
@@ -98,7 +98,14 @@ async function startRecording(ffmpegArguments, nice, filePath) {
     });
   }
   let ffmpegProcess;
-  if (nice === 0) {
+  if (taskset) {
+    log.debug('Start FFMPEG with taskset cpulist %j', taskset);
+    ffmpegArguments.unshift('ffmpeg');
+    ffmpegArguments.unshift(`${taskset}`);
+    ffmpegArguments.unshift('-c');
+    log.debug('Start FFMPEG with %j', ffmpegArguments);
+    ffmpegProcess = execa('taskset', ffmpegArguments);
+  } else if (nice === 0) {
     log.debug('Start FFMPEG with %j', ffmpegArguments);
     ffmpegProcess = execa('ffmpeg', ffmpegArguments);
   } else {
@@ -137,7 +144,8 @@ async function start({
   framerate,
   crf,
   nice,
-  threads
+  threads,
+  taskset
 }) {
   const widthAndHeight = size.split('x');
   const withoutTopBar =
@@ -156,7 +164,7 @@ async function start({
     offset,
     threads
   });
-  return startRecording(ffmpegArguments, nice, filePath);
+  return startRecording(ffmpegArguments, nice, taskset, filePath);
 }
 export /**
  * @returns A promise for a recording result, with a filePath property.

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "browsertime",
   "description": "Get performance metrics from your web page using Browsertime.",
-  "version": "17.2.0",
+  "version": "17.3.0",
   "bin": "./bin/browsertime.js",
   "type": "module",
   "dependencies": {
     "@cypress/xvfb": "1.2.4",
     "@devicefarmer/adbkit": "2.11.3",
     "@sitespeed.io/chromedriver": "111.0.5563-64",
-    "@sitespeed.io/edgedriver": "109.0.1518-70",
-    "@sitespeed.io/geckodriver": "0.32.0",
+    "@sitespeed.io/edgedriver": "111.0.1661-41",
+    "@sitespeed.io/geckodriver": "0.32.2",
     "@sitespeed.io/throttle": "5.0.0",
     "@sitespeed.io/tracium": "0.3.3",
     "btoa": "1.2.1",
@@ -28,7 +28,7 @@
     "lodash.merge": "4.6.2",
     "lodash.pick": "4.4.0",
     "lodash.set": "4.3.2",
-    "selenium-webdriver": "4.8.1",
+    "selenium-webdriver": "4.8.2",
     "yargs": "17.7.1"
   },
   "optionalDependencies": {