summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Larsson <lukas@erlang.org>2021-06-28 11:42:41 +0200
committerLukas Larsson <lukas@erlang.org>2021-08-27 14:06:53 +0200
commit1ef78b6594ba11e0a7f91e37b0637fde88210cd5 (patch)
treef7c16dcd8a4951aa06abb5c241cb5b6adc8f822a
parent027e601450a8020697b58d4c2794391a8c727728 (diff)
downloaderlang-1ef78b6594ba11e0a7f91e37b0637fde88210cd5.tar.gz
erts: Fix erl -emu_flavor docs and expand BeamJit perf
-rw-r--r--erts/doc/src/erl_cmd.xml9
-rw-r--r--erts/emulator/internal_doc/BeamAsm.md5
2 files changed, 11 insertions, 3 deletions
diff --git a/erts/doc/src/erl_cmd.xml b/erts/doc/src/erl_cmd.xml
index 5220663f92..7ef3ca88f9 100644
--- a/erts/doc/src/erl_cmd.xml
+++ b/erts/doc/src/erl_cmd.xml
@@ -304,10 +304,13 @@ $ <input>erl \
<item>
<p>Useful for debugging. Prints the arguments sent to the emulator.</p>
</item>
- <tag><c><![CDATA[-emu_flavor Flavor]]></c></tag>
+ <tag><c><![CDATA[-emu_flavor emu|jit|smp]]></c></tag>
<item>
- <p>Start an emulator of a different flavor. The current available flavors
- are: <c>emu</c> and <c>jit</c>. You can combine this flag with
+ <p>Start an emulator of a different flavor. Normally only one flavor is
+ available, more can be added by building specific flavors. The currently
+ available flavors are: <c>emu</c> and <c>jit</c>.
+ The <c>smp</c> flavor is an alias for the current default flavor.
+ You can combine this flag with
<c>--emu_type</c>. You can get the current flavor at run-time using
<seeerl marker="erlang#system_info_emu_flavor">
<c>erlang:system_info(emu_flavor)</c></seeerl>.
diff --git a/erts/emulator/internal_doc/BeamAsm.md b/erts/emulator/internal_doc/BeamAsm.md
index 4988126e62..3b4ac619ce 100644
--- a/erts/emulator/internal_doc/BeamAsm.md
+++ b/erts/emulator/internal_doc/BeamAsm.md
@@ -407,6 +407,11 @@ we have found useful:
Create an archive with all the artifacts needed to inspect the data
on another host. In early version of perf this command does not work,
instead you can use [this bash script](https://github.com/torvalds/linux/blob/master/tools/perf/perf-archive.sh).
+* `perf report` gives "failed to process sample" and/or "failed to process type: 68"
+ This probably means that you are running a bugge version of perf. We have
+ seen this when running Ubuntu 18.04 with kernel version 4. If you update
+ to Ubuntu 20.04 or use Ubuntu 18.04 with kernel version 5 the problem
+ should go away.
## FAQ