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

          --- old/hotspot/src/share/vm/trace/traceEventIds.xsl
          +++ new/hotspot/src/share/vm/trace/traceEventIds.xsl

   1    1  <?xml version="1.0" encoding="utf-8"?>
   2    2  <!--
   3    3   Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
   4    4   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   5    5  
   6    6   This code is free software; you can redistribute it and/or modify it
   7    7   under the terms of the GNU General Public License version 2 only, as
   8    8   published by the Free Software Foundation.
   9    9  
  10   10   This code is distributed in the hope that it will be useful, but WITHOUT
  11   11   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  12   12   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  13   13   version 2 for more details (a copy is included in the LICENSE file that
  14   14   accompanied this code).
  15   15  
  16   16   You should have received a copy of the GNU General Public License version
  17   17   2 along with this work; if not, write to the Free Software Foundation,
  18   18   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  19   19  
  20   20   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  21   21   or visit www.oracle.com if you need additional information or have any

  22   22   questions.
  23   23  -->
  24   24  
  25   25  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  26   26  <xsl:import href="xsl_util.xsl"/>
  27   27  <xsl:output method="text" indent="no" omit-xml-declaration="yes"/>
  28   28  
  29   29  <xsl:template match="/">
  30   30    <xsl:call-template name="file-header"/>
  31   31  
  32      -#ifndef TRACEFILES_JFREVENTIDS_HPP
  33      -#define TRACEFILES_JFREVENTIDS_HPP
       32 +#ifndef TRACEFILES_TRACEEVENTIDS_HPP
       33 +#define TRACEFILES_TRACEEVENTIDS_HPP
  34   34  
  35   35  #include "utilities/macros.hpp"
  36      -
  37   36  #if INCLUDE_TRACE
  38      -
  39   37  #include "trace/traceDataTypes.hpp"
  40   38  
  41   39  /**
  42   40   * Enum of the event types in the JVM
  43   41   */
  44   42  enum TraceEventId {
  45   43    _traceeventbase = (NUM_RESERVED_EVENTS-1), // Make sure we start at right index.
  46   44    
  47   45    // Events -> enum entry
  48   46  <xsl:for-each select="trace/events/event">

  49   47    <xsl:value-of select="concat('  Trace', @id, 'Event,', $newline)"/>
  50   48  </xsl:for-each>
  51   49    MaxTraceEventId
  52   50  };
  53   51  
  54   52  /**
  55   53   * Struct types in the JVM
  56   54   */
  57   55  enum TraceStructId {
  58   56  <xsl:for-each select="trace/types/content_types/*">
  59   57    <xsl:value-of select="concat('  Trace', @id, 'Struct,', $newline)"/>

  60   58  </xsl:for-each>
  61   59  <xsl:for-each select="trace/events/*">
  62   60    <xsl:value-of select="concat('  Trace', @id, 'Struct,', $newline)"/>
  63   61  </xsl:for-each>
  64   62    MaxTraceStructId
  65   63  };
  66   64  
  67   65  typedef enum TraceEventId  TraceEventId;
  68   66  typedef enum TraceStructId TraceStructId;
  69   67  
  70      -#endif
  71      -#endif
       68 +#endif // INCLUDE_TRACE
       69 +#endif // TRACEFILES_TRACEEVENTIDS_HPP
  72   70  </xsl:template>
  73   71  
  74   72  </xsl:stylesheet>
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX