Add mps_clocks_per_sec to the eventinit header, and put some header-checking code into eventcnv, so now we have at least a rudimentary check that a binary event log is readable.

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

3 files changed, 64 insertions, 11 deletions

diff --git a/mps/code/event.c b/mps/code/event.c
index aeaeaba9c48..42c37d8113f 100644
--- a/mps/code/event.c
+++ b/mps/code/event.c
@@ -207,8 +207,9 @@ void EventInit(void)
     EventKindControl = (Word)mps_lib_telemetry_control();
     EventInternSerial = (Serial)1; /* 0 is reserved */
     (void)EventInternString(MPSVersion()); /* emit version */
-    EVENT6(EventInit, EVENT_VERSION_MAJOR, EVENT_VERSION_MEDIAN,
-           EVENT_VERSION_MINOR, EventCodeMAX, EventNameMAX, MPS_WORD_WIDTH);
+    EVENT7(EventInit, EVENT_VERSION_MAJOR, EVENT_VERSION_MEDIAN,
+           EVENT_VERSION_MINOR, EventCodeMAX, EventNameMAX, MPS_WORD_WIDTH,
+           mps_clocks_per_sec());
     /* flush these initial events to get the first ClockSync out. */
     EventSync();
   } else {
diff --git a/mps/code/eventcnv.c b/mps/code/eventcnv.c
index d1c9de4d518..4ac57198b9c 100644
--- a/mps/code/eventcnv.c
+++ b/mps/code/eventcnv.c
@@ -46,18 +46,39 @@
 static EventClock eventTime; /* current event time */
 static char *prog; /* program name */
 
-/* everror -- error signalling */
+/* Errors and Warnings */
 
-static void everror(const char *format, ...)
-{
-  va_list args;
+/* fevwarn -- flush stdout, write message to stderr */
 
+static void fevwarn(const char *prefix, const char *format, va_list args)
+{
   fflush(stdout); /* sync */
-  fprintf(stderr, "%s: @", prog);
+  fprintf(stderr, "%s: %s @", prog, prefix);
   EVENT_CLOCK_PRINT(stderr, eventTime);
-  va_start(args, format);
+  fprintf(stderr, " ");
   vfprintf(stderr, format, args);
   fprintf(stderr, "\n");
+}
+
+/* evwarn -- flush stdout, warn to stderr */
+
+static void evwarn(const char *format, ...)
+{
+  va_list args;
+
+  va_start(args, format);
+  fevwarn("Warning", format, args);
+  va_end(args);
+}
+
+/* everror -- flush stdout, mesage to stderr, exit */
+
+static void everror(const char *format, ...)
+{
+  va_list args;
+
+  va_start(args, format);
+  fevwarn("Error", format, args);
   va_end(args);
   exit(EXIT_FAILURE);
 }
@@ -164,9 +185,37 @@ static void readLog(EventProc proc)
     if (res != ResOK) everror("Truncated log");
     eventTime = event->any.clock;
     code = event->any.code;
+    
+    /* Special handling for some events, prior to text output */
+
+    switch(code) {
+    case EventEventInitCode:
+      if ((event->EventInit.f0 != EVENT_VERSION_MAJOR) ||
+          (event->EventInit.f1 != EVENT_VERSION_MEDIAN) ||
+          (event->EventInit.f2 != EVENT_VERSION_MINOR))
+        evwarn("Event log version does not match: %d.%d.%d vs %d.%d.%d",
+               event->EventInit.f0,
+               event->EventInit.f1,
+               event->EventInit.f2,
+               EVENT_VERSION_MAJOR,
+               EVENT_VERSION_MEDIAN,
+               EVENT_VERSION_MINOR);
+
+      if (event->EventInit.f3 != EventCodeMAX)
+        evwarn("Event log may contain unknown events with codes from %d to %d",
+               EventCodeMAX+1, event->EventInit.f3);
+
+      if (event->EventInit.f5 != MPS_WORD_WIDTH)
+        /* This probably can't happen; other things will break
+         * before we get here */
+        evwarn("Event log has incompatible word width: %d instead of %d",
+               event->EventInit.f5,
+               MPS_WORD_WIDTH);
+      break;
+      }
 
     EVENT_CLOCK_PRINT(stdout, eventTime);
-    printf(" %X", (unsigned)code);
+    printf(" %4X", (unsigned)code);
 
     switch (code) {
 #define EVENT_PARAM_PRINT(name, index, sort, ident) \
@@ -176,6 +225,8 @@ static void readLog(EventProc proc)
          EVENT_##name##_PARAMS(EVENT_PARAM_PRINT, name) \
          break;
        EVENT_LIST(EVENT_PRINT, X)
+    default:
+      evwarn("Unknown event code %d", code);
     }
 
     putchar('\n');
diff --git a/mps/code/eventdef.h b/mps/code/eventdef.h
index 4e4fe899433..d2f8aeaf55f 100644
--- a/mps/code/eventdef.h
+++ b/mps/code/eventdef.h
@@ -37,7 +37,7 @@
  */
 
 #define EVENT_VERSION_MAJOR  ((unsigned)1)
-#define EVENT_VERSION_MEDIAN ((unsigned)0)
+#define EVENT_VERSION_MEDIAN ((unsigned)1)
 #define EVENT_VERSION_MINOR  ((unsigned)2)
 
 
@@ -628,7 +628,8 @@
   PARAM(X,  2, U, minor)          /* EVENT_VERSION_MINOR */ \
   PARAM(X,  3, U, maxCode)        /* EventCodeMAX */ \
   PARAM(X,  4, U, maxNameLen)     /* EventNameMAX */ \
-  PARAM(X,  5, U, wordWidth)      /* MPS_WORD_WIDTH */
+  PARAM(X,  5, U, wordWidth)      /* MPS_WORD_WIDTH */ \
+  PARAM(X,  6, W, clocksPerSec)   /* mps_clocks_per_sec() */
 
 #define EVENT_EventClockSync_PARAMS(PARAM, X) \
   PARAM(X,  0, W, clock)          /* mps_clock() value */