Merge 1b47300 into 9d13d95

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ### Added
 
+* Added support to import from linux `perf script` [#135]
+
 ### Fixed
 
 ## [0.6.0]

README.md

@@ -57,9 +57,22 @@ into the browser from Chrome.
 
 If the `raw: true` flag is set when recording a dump, the resulting json dump can be imported into speedscope.
 
-### `perf` and `DTrace`
+### Linux `perf`
 
-If you process the output of `perf` or `DTrace` first with Brendan Gregg's `stackcollapse-*.pl` scripts (https://github.com/brendangregg/FlameGraph#2-fold-stacks), the result can be imported into speedscope.
+You can import profiles recorded using `perf record` and formatted using `perf script`.
+
+    perf record -a -F 999 -g -p PID > perf.data
+    perf script -i perf.data > profile.linux-perf.txt
+
+Then drop the resulting `perf.txt` into speedscope, or if you have speedscope installed
+locally, you can run:
+
+    perf record -a -F 999 -g -p PID > perf.data
+    perf script -i perf.data | speedscope -
+
+### `DTrace`
+
+If you process the output of `DTrace` first with Brendan Gregg's `stackcollapse-*.pl` scripts (https://github.com/brendangregg/FlameGraph#2-fold-stacks), the result can be imported into speedscope.
 
 ## Importing via URL
 

package.json

@@ -12,7 +12,7 @@
     "prepack": "./scripts/build-release.sh",
     "prettier": "prettier --write 'src/**/*.ts' 'src/**/*.tsx'",
     "lint": "eslint 'src/**/*.ts' 'src/**/*.tsx'",
-    "jest": "./scripts/test-setup.sh && jest",
+    "jest": "./scripts/test-setup.sh && jest --runInBand",
     "coverage": "npm run jest -- --coverage && coveralls < coverage/lcov.info",
     "test": "tsc --noEmit && npm run lint && npm run coverage",
     "serve": "parcel assets/index.html --open --no-autoinstall"