Mps br/diagtag:

diag.c: support tagging of diagnostics, and avoid having to 
  say DIAG_STREAM every time, with new macros:
    DIAG_SINGLEF, DIAG_FIRSTF, DIAG_MOREF, DIAG_END.
mpm.c: new WriteF_firstformat_v required by DIAG_MOREF.

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

1 files changed, 5 insertions, 3 deletions

diff --git a/mps/code/trace.c b/mps/code/trace.c
index da1952a5c37..d4ad1d25903 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -1903,14 +1903,14 @@ void TraceStart(Trace trace, double mortality, double finishingTime)
     } while (SegNext(&seg, arena, base));
   }
 
-  DIAG_WRITEF(( DIAG_STREAM,
-    "MPS: TraceStart, because code $U: $S\n",
+  DIAG_FIRSTF(( "TraceStart",
+    "because code $U: $S\n",
     trace->why, traceStartWhyToString(trace->why),
     NULL ));
 
   DIAG( ArenaDescribe(arena, DIAG_STREAM); );
 
-  DIAG_WRITEF(( DIAG_STREAM,
+  DIAG_MOREF((
     "MPS:   white set:$B\n",
     trace->white,
     NULL ));
@@ -1940,6 +1940,8 @@ void TraceStart(Trace trace, double mortality, double finishingTime)
       NULL ));
     TraceStartGenDesc_diag(&arena->topGen, -1);
   }
+  
+  DIAG_END( "TraceStart" );
 
   res = RootsIterate(ArenaGlobals(arena), rootGrey, (void *)trace);
   AVER(res == ResOK);