Catch-up merge from custom/cet/main to master.

Includes installable assertion handler, events in circular memory buffers, LARGEADDRESSAWARE, etc.

Copied from Perforce
 Change: 182176
 ServerID: perforce.ravenbrook.com

1 files changed, 8 insertions, 1 deletions

diff --git a/mps/code/trace.c b/mps/code/trace.c
index 9401696ba2d..041b136711f 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -732,6 +732,8 @@ found:
   arena->busyTraces = TraceSetAdd(arena->busyTraces, trace);
   AVERT(Trace, trace);
 
+  EVENT3(TraceCreate, trace, arena, (EventFU)why);
+
   /* We suspend the mutator threads so that the PoolWhiten methods */
   /* can calculate white sets without the mutator allocating in */
   /* buffers under our feet. */
@@ -1681,7 +1683,7 @@ Res TraceStart(Trace trace, double mortality, double finishingTime)
   AVER(finishingTime >= 0.0);
 
   arena = trace->arena;
-
+  
   /* From the already set up white set, derive a grey set. */
 
   /* @@@@ Instead of iterating over all the segments, we could */
@@ -1789,6 +1791,11 @@ Res TraceStart(Trace trace, double mortality, double finishingTime)
 
   /* @@ DIAG for rate of scanning here. */
 
+  EVENT8(TraceStart, trace, mortality, finishingTime,
+         trace->condemned, trace->notCondemned,
+         trace->foundation, trace->white,
+         trace->rate);
+
   STATISTIC_STAT(EVENT7(TraceStatCondemn, trace,
                                trace->condemned, trace->notCondemned,
                                trace->foundation, trace->rate,