Now there is no measurable performance penalty for events, they're on in all varieties (except we).

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

6 files changed, 15 insertions, 26 deletions

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 9141c34c9cd..3dfb562b401 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -130,7 +130,6 @@ CFDI = -DCONFIG_VAR_DI -DNDEBUG $(CFLAGSOPT)
 CFII = -DCONFIG_VAR_II -DNDEBUG $(CFLAGSOPT)
 CFCE = -DCONFIG_VAR_CE          $(CFLAGSOPTNODEBUG)
 CFCI = -DCONFIG_VAR_CI          $(CFLAGSDEBUG)
-CFTI = -DCONFIG_VAR_TI          $(CFLAGSDEBUG)
 
 # Bind CFLAGS to the appropriate set of flags for the variety.
 # %%VARIETY: Add a test for the variety and set CFLAGS here.
@@ -158,10 +157,6 @@ else
 ifeq ($(VARIETY),ci)
 CFLAGS=$(CFLAGSCOMMON) $(CFCI)
 else
-ifeq ($(VARIETY),ti)
-CFLAGS=$(CFLAGSCOMMON) $(CFTI)
-else
-endif
 endif
 endif
 endif
diff --git a/mps/code/commpre.nmk b/mps/code/commpre.nmk
index a27b704134c..ff8641446ab 100644
--- a/mps/code/commpre.nmk
+++ b/mps/code/commpre.nmk
@@ -151,7 +151,6 @@ CFHI = /DCONFIG_VAR_HI $(CRTFLAGSH)  $(CFLAGSHOT)  $(CFLAGSINTERNAL)
 CFDI = /DCONFIG_VAR_DI $(CRTFLAGSH)  $(CFLAGSHOT)  $(CFLAGSINTERNAL)
 CFCE = /DCONFIG_VAR_CE $(CRTFLAGSC)  $(CFLAGSCOOL) $(CFLAGSEXTERNAL)
 CFCI = /DCONFIG_VAR_CI $(CRTFLAGSC)  $(CFLAGSCOOL) $(CFLAGSINTERNAL)
-CFTI = /DCONFIG_VAR_TI $(CRTFLAGSC)  $(CFLAGSCOOL) $(CFLAGSINTERNAL)
 
 # Microsoft documentation is not very clear on the point of using both
 # optimization and debug information
@@ -171,7 +170,6 @@ LFHI = $(LINKFLAGSHOT)    $(LINKFLAGSINTERNAL)
 LFDI = $(LINKFLAGSHOT)    $(LINKFLAGSINTERNAL)
 LFCE = $(LINKFLAGSCOOL)   $(LINKFLAGSEXTERNAL)
 LFCI = $(LINKFLAGSCOOL)   $(LINKFLAGSINTERNAL)
-LFTI = $(LINKFLAGSCOOL)   $(LINKFLAGSINTERNAL)
 
 #LFCV = /PROFILE /DEBUG:full /DEBUGTYPE:cv
 
@@ -187,7 +185,6 @@ LIBFLAGSHI =
 LIBFLAGSDI =
 LIBFLAGSCE =
 LIBFLAGSCI =
-LIBFLAGSTI =
 #LIBFLAGSCV =
 
 # Browser database manager [not used at present]
diff --git a/mps/code/config.h b/mps/code/config.h
index 85ae3d07eea..0685c84fd4b 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -49,7 +49,7 @@
 #define CONFIG_ASSERT
 #define CHECKLEVEL_INITIAL CheckLevelMINIMAL
 /* no statistic meters */
-/* no telemetry log events */
+#define CONFIG_LOG
 
 #elif defined(CONFIG_VAR_DI) /* Diagnostic variety */
 #define CONFIG_ASSERT
@@ -61,18 +61,12 @@
  */
 #define DIAG_WITH_STREAM_AND_WRITEF
 /* #define DIAG_WITH_PRINTF */
-/* no telemetry log events */
+#define CONFIG_LOG
 
 #elif defined(CONFIG_VAR_CI) || defined(CONFIG_VAR_CE) /* Cool varieties */
 #define CONFIG_ASSERT
 /* ... let PRODUCT determine CHECKLEVEL_INITIAL */
 #define CONFIG_STATS
-/* no telemetry log events */
-
-#elif defined(CONFIG_VAR_TI)    /* Telemetry, Internal; variety.ti */
-#define CONFIG_ASSERT
-/* ... let PRODUCT determine CHECKLEVEL_INITIAL */
-#define CONFIG_STATS
 #define CONFIG_LOG
 
 #elif defined(CONFIG_VAR_II)    /* Ice, Internal; variety.ii (HotLog) */
@@ -82,8 +76,6 @@
 #define CONFIG_LOG
 #endif
 
-#define CONFIG_STATS
-#define CONFIG_LOG
 
 /* Build Features */
 
diff --git a/mps/code/event.c b/mps/code/event.c
index 9018e8e9b33..6400e6917e6 100644
--- a/mps/code/event.c
+++ b/mps/code/event.c
@@ -383,9 +383,9 @@ void EventDump(mps_lib_FILE *stream)
 #else /* EVENT, not */
 
 
-Res (EventSync)(void)
+void (EventSync)(void)
 {
-  return ResOK;
+  NOOP;
 }
 
 
@@ -413,16 +413,18 @@ EventControlSet (EventControl)(EventControlSet resetMask,
 EventStringId (EventInternString)(const char *label)
 {
   UNUSED(label);
-  NOTREACHED;
-  return (EventInternString)0x9024EACH;
+  /* EventInternString is reached in varieties without events, but the result
+     is not used for anything. */
+  return (EventStringId)0x9024EAC8;
 }
 
 
 Word (EventInternGenString)(size_t len, const char *label)
 {
   UNUSED(len); UNUSED(label);
-  NOTREACHED;
-  return (EventInternString)0x9024EACH;
+  /* EventInternGenString is reached in varieties without events, but
+     the result is not used for anything. */
+  return (EventStringId)0x9024EAC8;
 }
 
 
@@ -430,7 +432,8 @@ void (EventLabelAddr)(Addr addr, Word id)
 {
   UNUSED(addr);
   UNUSED(id);
-  NOTREACHED;
+  /* EventLabelAddr is reached in varieties without events, but doesn't have
+     to do anything. */
 }
 
 
diff --git a/mps/code/eventcom.h b/mps/code/eventcom.h
index 89b216132b1..2442439d287 100644
--- a/mps/code/eventcom.h
+++ b/mps/code/eventcom.h
@@ -53,6 +53,7 @@ typedef unsigned long long EventClock;
   END
 
 #define EVENT_CLOCK_PRINT(stream, clock) fprintf(stream, "%llu", clock)
+/* FIXME: No EVENT_CLOCK_WRITE */
 
 #endif /* __has_builtin(__builtin_readcyclecounter) */
 
@@ -95,6 +96,7 @@ typedef Word EventClock;
 
 #define EVENT_CLOCK_PRINT(stream, clock) \
   fprintf(stream, "%llu", (unsigned long long)clock)
+/* FIXME: No EVENT_CLOCK_WRITE */
 
 #endif
 
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index b5a58eeef59..a32abe3cca2 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -978,7 +978,7 @@ extern void StackProbe(Size depth);
 #elif defined(STATISTICS_NONE)
 
 #define STATISTIC(gather) DISCARD(((gather), 0))
-#define STATISTIC_STAT(gather) DISCARD_STAT(gather)
+#define STATISTIC_STAT DISCARD_STAT
 #define STATISTIC_WRITE(format, arg)
 
 #else