From 7b801aa3641f0a59448604c857cfb0e67eed9e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Mon, 2 May 2016 18:29:26 +0200
Subject: erts: Update garbage collection trace documentation

---
 erts/doc/src/erlang.xml | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 423ccdf98f..3ccb76f7b3 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4702,7 +4702,7 @@ os_prompt% </pre>
 	       detailed information about garbage collection for this process.
 	       The content of <c><anno>GCInfo</anno></c> can be changed without
 	       prior notice.
-               See <seealso marker="#gc_start">gc_start</seealso> in
+               See <seealso marker="#gc_minor_start">gc_minor_start</seealso> in
                <seealso marker="#trace/3">erlang:trace/3</seealso> for details about
                what each item means.
             </p>
@@ -7966,7 +7966,7 @@ ok
               <c>stack_size</c>, <c>mbuf_size</c>, <c>old_heap_size</c>,
               and <c>old_heap_block_size</c>. These tuples are
               explained in the description of trace message
-              <seealso marker="#gc_start">gc_start</seealso> (see
+              <seealso marker="#gc_minor_start">gc_minor_start</seealso> (see
               <seealso marker="#trace/3">erlang:trace/3</seealso>).
               New tuples can be added, and the order of the tuples in
               the <c>Info</c> list can be changed at any time without
@@ -8556,7 +8556,7 @@ timestamp() ->
           <tag><c>garbage_collection</c></tag>
           <item>
             <p>Traces garbage collections of processes.</p>
-            <p>Message tags: <c><seealso marker="#trace_3_trace_messages_gc_start">gc_start</seealso></c> and <c><seealso marker="#trace_3_trace_messages_gc_end">gc_end</seealso></c>.</p>
+            <p>Message tags: <c><seealso marker="#trace_3_trace_messages_gc_minor_start">gc_minor_start</seealso></c> and <c><seealso marker="#trace_3_trace_messages_gc_minor_end">gc_minor_end</seealso></c>.</p>
           </item>
           <tag><c>timestamp</c></tag>
           <item>
@@ -8880,12 +8880,12 @@ timestamp() ->
             </p>
           </item>
           <tag>
-            <marker id="trace_3_trace_messages_gc_start"></marker>
-            <c>{trace, Pid, gc_start, Info}</c>
+            <marker id="trace_3_trace_messages_gc_minor_start"></marker>
+            <c>{trace, Pid, gc_minor_start, Info}</c>
           </tag>
           <item>
-          <marker id="gc_start"></marker>
-            <p>Sent when garbage collection is about to be started.
+          <marker id="gc_minor_start"></marker>
+            <p>Sent when a young garbage collection is about to be started.
               <c>Info</c> is a list of two-element tuples, where
               the first element is a key, and the second is the value.
               Do not depend on any order of the tuples.
@@ -8925,15 +8925,32 @@ timestamp() ->
             <p>All sizes are in words.</p>
           </item>
           <tag>
-            <marker id="trace_3_trace_messages_gc_end"></marker>
-            <c>{trace, Pid, gc_end, Info}</c>
+            <marker id="trace_3_trace_messages_gc_minor_end"></marker>
+            <c>{trace, Pid, gc_minor_end, Info}</c>
           </tag>
           <item>
-            <p>Sent when garbage collection is finished. <c>Info</c>
-              contains the same kind of list as in message <c>gc_start</c>,
+            <p>Sent when young garbage collection is finished. <c>Info</c>
+              contains the same kind of list as in message <c>gc_minor_start</c>,
               but the sizes reflect the new sizes after
               garbage collection.</p>
           </item>
+          <tag>
+            <marker id="trace_3_trace_messages_gc_major_start"></marker>
+            <c>{trace, Pid, gc_major_start, Info}</c>
+          </tag>
+          <item>
+            <p>Sent when fullsweep garbage collection is about to be started. <c>Info</c>
+                contains the same kind of list as in message <c>gc_minor_start</c>.</p>
+          </item>
+          <tag>
+            <marker id="trace_3_trace_messages_gc_major_end"></marker>
+            <c>{trace, Pid, gc_major_end, Info}</c>
+          </tag>
+          <item>
+            <p>Sent when fullsweep garbage collection is finished. <c>Info</c>
+                contains the same kind of list as in message <c>gc_minor_start</c>
+              but the sizes reflect the new sizes after a fullsweep garbage collection.</p>
+          </item>
         </taglist>
         <p>If the tracing process/port dies or the tracer module returns
         <c>remove</c>, the flags are silently removed.</p>
-- 
cgit v1.2.3


From ddf385e4da6ecc453b4df99aba654a2b7525c6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Mon, 2 May 2016 18:37:04 +0200
Subject: erts: Remove forgotten atoms in erl_tracer

---
 erts/emulator/nifs/common/erl_tracer_nif.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/erts/emulator/nifs/common/erl_tracer_nif.c b/erts/emulator/nifs/common/erl_tracer_nif.c
index 1bb6b940c4..55bfc1a470 100644
--- a/erts/emulator/nifs/common/erl_tracer_nif.c
+++ b/erts/emulator/nifs/common/erl_tracer_nif.c
@@ -72,8 +72,6 @@ ERL_NIF_INIT(erl_tracer, nif_funcs, load, NULL, upgrade, unload)
     ATOM_DECL(trace);                              \
     ATOM_DECL(trace_ts);                           \
     ATOM_DECL(true);                               \
-    ATOM_DECL(gc_start);                           \
-    ATOM_DECL(gc_end);                             \
     ATOM_DECL(gc_minor_start);                     \
     ATOM_DECL(gc_minor_end);                       \
     ATOM_DECL(gc_major_start);                     \
-- 
cgit v1.2.3