aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/atom.names
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-04-29 18:36:22 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-04-29 18:36:22 +0200
commita8667f3fcdd4ee1f59f4826d148dd0838680eda9 (patch)
tree74cd7f5a1c6c282d76c07362cee96f0b8ad46793 /erts/emulator/beam/atom.names
parent47b6c981fb461a4b85444ce9dd072b64937e4b84 (diff)
parent535aec73c5af7c7e2f48f29ad35d2319d91b9c90 (diff)
downloadotp-a8667f3fcdd4ee1f59f4826d148dd0838680eda9.tar.gz
otp-a8667f3fcdd4ee1f59f4826d148dd0838680eda9.tar.bz2
otp-a8667f3fcdd4ee1f59f4826d148dd0838680eda9.zip
Merge branch 'egil/erts/tracing-support-lttng/OTP-13532'
* egil/erts/tracing-support-lttng/OTP-13532: (28 commits) runtime_tools: User's guide to LTTng and dyntrace runtime_tools: Fix Dtrace build erts: Fix gc messages in tracer_SUITE erts: Fix gc messages in sensitive_SUITE erts: Fix gc messages in trace_port_SUITE tools: Update fprof tests tools: Update fprof with new gc traces runtime_tools: Update dyntrace_lttng_SUITE tests runtime_tools: Add 'return_to' for call tracing erts: Fix return_to trace callback erts: Update erl_tracer documentation erts: Fix erl_tracer documentation typos Update preloaded erl_tracer.beam erts: Update erl_tracer type specs runtime_tools: Add lttng dyntrace tests runtime_tools: Extend 'trace' and 'enabled' tracer callbacks erts: Extend 'enabled' and 'trace' tracer callbacks runtime_tools: Extend 'enabled' tracer callbacks erts: Extend 'enabled' tracer callbacks runtime_tools: Update lttng garbage collection trace ...
Diffstat (limited to 'erts/emulator/beam/atom.names')
-rw-r--r--erts/emulator/beam/atom.names4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 8c51f788c0..3022c0a99a 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -273,6 +273,10 @@ atom garbage_collecting
atom garbage_collection
atom garbage_collection_info
atom gc_end
+atom gc_major_end
+atom gc_major_start
+atom gc_minor_end
+atom gc_minor_start
atom gc_start
atom Ge='>='
atom generational