Switching eventtypes (large hex constants) to codes (16-bit ids).

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

5 files changed, 9 insertions, 112 deletions

diff --git a/mps/code/event.h b/mps/code/event.h
index 97e622b628d..f089560cf4d 100644
--- a/mps/code/event.h
+++ b/mps/code/event.h
@@ -49,7 +49,7 @@ extern Word EventKindControl;
         EventFlush(); \
       AVER(_size <= (size_t)(EventLimit - EventNext)); \
       _event = (void *)EventNext; \
-      _event->code = Event##name; \
+      _event->code = Event##name##Code; \
       _event->clock = mps_clock();
 
 #define EVENT_END(name, size) \
diff --git a/mps/code/eventcnv.c b/mps/code/eventcnv.c
index 3414bafde9b..4e658f3d9c1 100644
--- a/mps/code/eventcnv.c
+++ b/mps/code/eventcnv.c
@@ -414,7 +414,7 @@ static void readLog(EventProc proc)
     if (res == ResFAIL) break; /* eof */
     if (res != ResOK) everror("Truncated log");
     eventTime = event->any.clock;
-    code = EventGetCode(event);
+    code = event->any.code;
 
     /* Output bucket, if necessary, and update counters */
     if (bucketSize != 0 && eventTime >= bucketLimit) {
@@ -456,7 +456,7 @@ static void readLog(EventProc proc)
      }
 
      switch (event->any.code) {
-     case EventLabel: {
+     case EventLabelCode: {
        switch (style) {
        case '\0': case 'C': {
          EventString sym = LabelText(proc, event->Label.f1);
@@ -480,7 +480,7 @@ static void readLog(EventProc proc)
        } break;
        }
      } break;
-     case EventMeterValues: {
+     case EventMeterValuesCode: {
        switch (style) {
        case '\0': {
          if (event->MeterValues.f3 == 0) {
@@ -516,7 +516,7 @@ static void readLog(EventProc proc)
        } break;
        }
      } break;
-     case EventPoolInit: { /* pool, arena, class */
+     case EventPoolInitCode: { /* pool, arena, class */
        printf(styleConv, (ulongest_t)event->PoolInit.f0);
        printf(styleConv, (ulongest_t)event->PoolInit.f1);
        /* class is a Pointer, but we label them, so call printAddr */
diff --git a/mps/code/eventcom.h b/mps/code/eventcom.h
index 18bef8ec4ca..f0f4bfdcc5f 100644
--- a/mps/code/eventcom.h
+++ b/mps/code/eventcom.h
@@ -15,7 +15,6 @@
 
 /* Types for event fields */
 
-typedef Word EventType;
 typedef unsigned short EventCode;
 typedef unsigned EventKind;
 
@@ -59,6 +58,7 @@ enum {
 /* Note that enum values can be up to fifteen bits long portably. */
 #define EVENT_ENUM(X, name, code, always, kind, count, format) \
   enum { \
+    Event##name##Code = code, \
     Event##name##Always = always, \
     Event##name##Kind = EventKind##kind \
   };
@@ -82,13 +82,13 @@ typedef double EventFD;
 
 /* Common prefix for all event structures */
 typedef struct EventAnyStruct {
-  Word code;
+  EventCode code;
   Word clock;
 } EventAnyStruct;
 
 #define EVENT_STRUCT(X, name, _code, always, kind, count, format) \
   typedef struct Event##name##Struct { \
-    Word code; \
+    EventCode code; \
     Word clock; \
     EVENT_STRUCT_FIELDS_##count format \
   } Event##name##Struct;
@@ -451,108 +451,6 @@ typedef union EventUnion {
 #endif /* EVENT */
 
 
-/* Event types -- see <design/telemetry/>
- *
- * These names are intended to be mnemonic.  They are derived from
- * selected letters as indicated, using the transliteration in
- * guide.hex.trans.
- *
- * These definitions will be unnecessary when the event codes are
- * changed to 16-bit.  See <code/eventdef.h>.
- */
-                                                    /* EVent ... */
-#define EventEventTime      ((EventType)0xEF213E99) /* TIME */
-#define EventPoolInit       ((EventType)0xEFB07141) /* POoL INIt */
-#define EventPoolFinish     ((EventType)0xEFB07F14) /* POoL FINish */
-#define EventPoolAlloc      ((EventType)0xEFB07A77) /* POoL ALLoc */
-#define EventPoolFree       ((EventType)0xEFB07F6E) /* POoL FREe */
-#define EventArenaCreateVM  ((EventType)0xEFA64CF3) /* AReNa Create VM */
-#define EventArenaCreateVMNZ ((EventType)0xEFA64CF2) /* AReNa Create VmnZ */
-#define EventArenaCreateCL  ((EventType)0xEFA64CC7) /* AReNa Create CL */
-#define EventArenaDestroy   ((EventType)0xEFA64DE5) /* AReNa DEStroy */
-#define EventArenaAlloc     ((EventType)0xEFA64A77) /* AReNa ALLoc */
-#define EventArenaFree      ((EventType)0xEFA64F6E) /* AReNa FREe */
-#define EventSegAlloc       ((EventType)0xEF5E9A77) /* SEG ALLoc */
-#define EventSegFree        ((EventType)0xEF5E9F6E) /* SEG FREe */
-#define EventSegMerge       ((EventType)0xEF5E93E6) /* SEG MERge */
-#define EventSegSplit       ((EventType)0xEF5E95B7) /* SEG SPLit */
-#define EventAMCGenCreate   ((EventType)0xEFA3C94C) /* AMC GeN Create */
-#define EventAMCGenDestroy  ((EventType)0xEFA3C94D) /* AMC GeN Destroy */
-#define EventAMCInit        ((EventType)0xEFA3C141) /* AMC INIt */
-#define EventAMCFinish      ((EventType)0xEFA3CF14) /* AMC FINish */
-#define EventAMCTraceBegin  ((EventType)0xEFA3C26B) /* AMC TRace Begin */
-#define EventAMCScanBegin   ((EventType)0xEFA3C5CB) /* AMC SCan Begin */
-#define EventAMCScanEnd     ((EventType)0xEFA3C5CE) /* AMC SCan End */
-#define EventAMCFix         ((EventType)0xEFA3CF18) /* AMC FIX */
-#define EventAMCFixInPlace  ((EventType)0xEFA3CF8A) /* AMC FiX Ambig */
-#define EventAMCFixForward  ((EventType)0xEFA3CF8F) /* AMC FiX Forward */
-#define EventAMCReclaim     ((EventType)0xEFA3C6EC) /* AMC REClaim */
-#define EventTraceStart     ((EventType)0xEF26AC52) /* TRACe STart */
-#define EventTraceCreate    ((EventType)0xEF26ACC6) /* TRACe CReate */
-#define EventTraceDestroy   ((EventType)0xEF26ACDE) /* TRACe DEstroy */
-#define EventSegSetGrey     ((EventType)0xEF59596A) /* SeG Set GRAy */
-#define EventTraceFlipBegin ((EventType)0xEF26AF7B) /* TRAce FLip Begin */
-#define EventTraceFlipEnd   ((EventType)0xEF26AF7E) /* TRAce FLip End */
-#define EventTraceReclaim   ((EventType)0xEF26A6EC) /* TRAce REClaim */
-#define EventTraceScanSeg   ((EventType)0xEF26A559) /* TRAce ScanSeG */
-#define EventTraceScanSingleRef \
-                            ((EventType)0xEF26A556) /* TRAce ScanSingleRef */
-#define EventTraceAccess    ((EventType)0xEF26AACC) /* TRAce ACCess */
-#define EventTracePoll      ((EventType)0xEF26AB01) /* TRAce POLl */
-#define EventTraceStep      ((EventType)0xEF26A52B) /* TRAce STeP */
-#define EventTraceFix       ((EventType)0xEF26AF18) /* TRAce FIX */
-#define EventTraceFixSeg    ((EventType)0xEF26AF85) /* TRAce FiX Seg */
-#define EventTraceFixWhite  ((EventType)0xEF26AF83) /* TRAce FiX White */
-#define EventTraceScanArea  ((EventType)0xEF26A5CA) /* TRAce SCan Area */
-#define EventTraceScanAreaTagged ((EventType)0xEF26A5C2) /* TRAce SCan area Tagged */
-#define EventVMCreate       ((EventType)0xEFF3C6EA) /* VM CREAte */
-#define EventVMDestroy      ((EventType)0xEFF3DE52) /* VM DESTroy */
-#define EventVMMap          ((EventType)0xEFF33AB9) /* VM MAP */
-#define EventVMUnmap        ((EventType)0xEFF3043B) /* VM UNMaP */
-#define EventIntern         ((EventType)0xEF142E64) /* INTERN */
-#define EventArenaExtend    ((EventType)0xEFA64E82) /* AReNa EXTend */
-#define EventArenaRetract   ((EventType)0xEFA646E2) /* AReNa RETract */
-#define EventRootScan       ((EventType)0xEF625CA4) /* RooT SCAN */
-#define EventLabel          ((EventType)0xEF7ABE79) /* LABEL */
-#define EventTraceSegGreyen ((EventType)0xEF26A599) /* TRAce SeG Greyen */
-#define EventBufferReserve  ((EventType)0xEFB0FF6E) /* BUFFer REserve */
-#define EventBufferCommit   ((EventType)0xEFB0FFC0) /* BUFFer COmmit */
-#define EventBufferInit     ((EventType)0xEFB0FF14) /* BUFFer INit */
-#define EventBufferInitSeg  ((EventType)0xEFB0F15E) /* BUFFer Init SEg */
-#define EventBufferInitRank ((EventType)0xEFB0F16A) /* BUFFer Init RAnk */
-#define EventBufferInitEPVM ((EventType)0xEFB0F1EF) /* BUFfer Init EpVm */
-#define EventBufferFinish   ((EventType)0xEFB0FFF1) /* BUFFer FInish */
-#define EventBufferFill     ((EventType)0xEFB0FFF7) /* BUFFer FilL */
-#define EventBufferEmpty    ((EventType)0xEFB0FFE3) /* BUFFer EMpty */
-#define EventArenaAllocFail ((EventType)0xEFA64A7F) /* AReNa ALloc Fail */
-#define EventSegAllocFail   ((EventType)0xEF5E9A7F) /* SEG ALloc Fail */
-#define EventMeterInit      ((EventType)0xEF3E2141) /* METer INIt */
-#define EventMeterValues    ((EventType)0xEF3E2FA7) /* METer VALues */
-#define EventCBSInit        ((EventType)0xEFCB5141) /* CBS INIt */
-#define EventTraceStatCondemn ((EventType)0xEF26A5C0) /* TRAce Stat COndemn */
-#define EventTraceStatScan  ((EventType)0xEF26A55C) /* TRAce Stat SCan */
-#define EventTraceStatFix   ((EventType)0xEF26A5F8) /* TRAce Stat FiX */
-#define EventTraceStatReclaim ((EventType)0xEF26A56E) /* TRAce Stat REclaim */
-#define EventArenaWriteFaults ((EventType)0xEFA6436F) /* AReNa WRite Faults */
-#define EventPoolInitMV     ((EventType)0xEFB0713F) /* POoL Init MV */
-#define EventPoolInitMVFF   ((EventType)0xEFB071FF) /* POoL Init mvFF */
-#define EventPoolInitMFS    ((EventType)0xEFB07135) /* POoL Init MfS */
-#define EventPoolInitEPVM   ((EventType)0xEFB071EF) /* POoL Init EpVm */
-#define EventPoolInitEPDL   ((EventType)0xEFB071E7) /* POoL Init EpdL */
-#define EventPoolInitAMS    ((EventType)0xEFB071A5) /* POoL Init AmS */
-#define EventPoolInitAMC    ((EventType)0xEFB071AC) /* POoL Init AmC */
-#define EventPoolInitAMCZ   ((EventType)0xEFB071A2) /* POoL Init AmcZ */
-#define EventPoolInitAWL    ((EventType)0xEFB071A3) /* POoL Init AWl */
-#define EventPoolInitLO     ((EventType)0xEFB07170) /* POoL Init LO */
-#define EventPoolInitSNC    ((EventType)0xEFB07154) /* POoL Init SNc */
-#define EventPoolInitMVT    ((EventType)0xEFB07132) /* POoL Init MvT */
-#define EventPoolPush       ((EventType)0xEFB07B58) /* POoL PuSH */
-#define EventPoolPop        ((EventType)0xEFB07B0B) /* POoL POP */
-#define EventReservoirLimitSet ((EventType)0xEF6E5713) /* REServoir LIMit set */
-#define EventCommitLimitSet ((EventType)0xEFC03713) /* COMmit LIMit set */
-#define EventSpareCommitLimitSet ((EventType)0xEF5BC713) /* SPare Commit LIMit set */
-
-
 #endif /* eventcom_h */
 
 
diff --git a/mps/code/eventdef.h b/mps/code/eventdef.h
index 379abd28751..9cb66e3dbe9 100644
--- a/mps/code/eventdef.h
+++ b/mps/code/eventdef.h
@@ -32,7 +32,7 @@
  * and the major version when changing the format of the event file.
  */
 
-#define EVENT_VERSION_MAJOR  ((unsigned)0)
+#define EVENT_VERSION_MAJOR  ((unsigned)1)
 #define EVENT_VERSION_MEDIAN ((unsigned)0)
 #define EVENT_VERSION_MINOR  ((unsigned)0)
 
diff --git a/mps/code/eventpro.h b/mps/code/eventpro.h
index db5d23d40a1..bd6cbebfc76 100644
--- a/mps/code/eventpro.h
+++ b/mps/code/eventpro.h
@@ -21,7 +21,6 @@ typedef Res (*EventProcReader)(void *, void *, size_t);
 
 extern EventCode EventName2Code(char *name);
 extern char *EventCode2Name(EventCode code);
-extern EventCode EventGetCode(Event event);
 extern char *EventCode2Format(EventCode code);
 extern Bool EventCodeIsValid(EventCode code);