Print this page
rev 6909 : 8065361: Fixup headers and definitions for INCLUDE_TRACE
Reviewed-by: sla, stefank

Split Split Close
Expand all
Collapse all
          --- old/hotspot/src/share/vm/trace/traceEventClasses.xsl
          +++ new/hotspot/src/share/vm/trace/traceEventClasses.xsl
↓ open down ↓ 33 lines elided ↑ open up ↑
  34   34  
  35   35  // On purpose outside the INCLUDE_TRACE
  36   36  // Some parts of traceEvent.hpp are used outside of
  37   37  // INCLUDE_TRACE
  38   38  
  39   39  #include "memory/resourceArea.hpp"
  40   40  #include "tracefiles/traceTypes.hpp"
  41   41  #include "trace/traceEvent.hpp"
  42   42  #include "utilities/macros.hpp"
  43   43  #include "utilities/ticks.hpp"
  44      -
  45   44  #if INCLUDE_TRACE
  46      -
  47      -
  48   45  #include "trace/traceStream.hpp"
  49   46  #include "utilities/ostream.hpp"
  50   47  
  51   48    <xsl:apply-templates select="trace/events/struct" mode="trace"/>
  52   49    <xsl:apply-templates select="trace/events/event" mode="trace"/>
  53   50  
  54      -#else
       51 +#else // !INCLUDE_TRACE
  55   52  
  56   53  class TraceEvent {
  57   54  public:
  58   55    TraceEvent() {}
  59   56    void set_starttime(const Ticks&amp; time) {}
  60   57    void set_endtime(const Ticks&amp; time) {}
  61   58    bool should_commit() const { return false; }
  62   59    void commit() const {}
  63   60  };
  64   61  
  65   62    <xsl:apply-templates select="trace/events/struct" mode="empty"/>
  66   63    <xsl:apply-templates select="trace/events/event" mode="empty"/>
  67   64  
  68      -#endif
  69      -
  70      -#endif
       65 +#endif // INCLUDE_TRACE
       66 +#endif // TRACEFILES_TRACEEVENTCLASSES_HPP
  71   67  </xsl:template>
  72   68  
  73   69  <xsl:template match="struct" mode="trace">
  74   70  struct TraceStruct<xsl:value-of select="@id"/>
  75   71  {
  76   72  private:
  77   73  <xsl:apply-templates select="value" mode="write-fields"/>
  78   74  public:
  79   75  <xsl:apply-templates select="value" mode="write-setters"/>
  80   76  
↓ open down ↓ 177 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX