mem: Move trace functionality from the CommMonitor to a probe

This changeset moves the access trace functionality from the
CommMonitor into a separate probe. The probe can be hooked up to any
component that exports probe points of the type ProbePoints::Packet.

This patch moves the dependency on Google's Protocol Buffers library
from the CommMonitor to the MemTraceProbe, which means that the
CommMonitor (including stack distance profiling) no long depends on
it.

1 files changed, 0 insertions, 17 deletions

diff --git a/src/mem/comm_monitor.hh b/src/mem/comm_monitor.hh
index d2ce1d224..fb8f5eeb7 100644
--- a/src/mem/comm_monitor.hh
+++ b/src/mem/comm_monitor.hh
@@ -44,9 +44,7 @@
 #include "base/statistics.hh"
 #include "mem/mem_object.hh"
 #include "params/CommMonitor.hh"
-#include "proto/protoio.hh"
 #include "sim/probe/mem.hh"
-#include "sim/system.hh"
 
 /**
  * The communication monitor is a MemObject which can monitor statistics of
@@ -76,9 +74,6 @@ class CommMonitor : public MemObject
      */
     CommMonitor(Params* params);
 
-    /** Destructor */
-    ~CommMonitor();
-
     void init() M5_ATTR_OVERRIDE;
     void regStats() M5_ATTR_OVERRIDE;
     void startup() M5_ATTR_OVERRIDE;
@@ -391,12 +386,6 @@ class CommMonitor : public MemObject
     /** This function is called periodically at the end of each time bin */
     void samplePeriodic();
 
-    /**
-     * Callback to flush and close all open output streams on exit. If
-     * we were calling the destructor it could be done there.
-     */
-    void closeStreams();
-
     /** Periodic event called at the end of each simulation time bin */
     EventWrapper<CommMonitor, &CommMonitor::samplePeriodic> samplePeriodicEvent;
 
@@ -416,14 +405,8 @@ class CommMonitor : public MemObject
     /** Address mask for sources of write accesses to be captured */
     const Addr writeAddrMask;
 
-    /** The system in which the monitor lives */
-    System *const system;
-
     /** @} */
 
-    /** Output stream for a potential trace. */
-    ProtoOutputStream *traceStream;
-
     /** Instantiate stats */
     MonitorStats stats;