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/classfile/systemDictionary.cpp
          +++ new/hotspot/src/share/vm/classfile/systemDictionary.cpp
↓ open down ↓ 56 lines elided ↑ open up ↑
  57   57  #include "runtime/handles.inline.hpp"
  58   58  #include "runtime/java.hpp"
  59   59  #include "runtime/javaCalls.hpp"
  60   60  #include "runtime/mutexLocker.hpp"
  61   61  #include "runtime/orderAccess.inline.hpp"
  62   62  #include "runtime/signature.hpp"
  63   63  #include "services/classLoadingService.hpp"
  64   64  #include "services/threadService.hpp"
  65   65  #include "utilities/macros.hpp"
  66   66  #include "utilities/ticks.hpp"
  67      -
  68   67  #if INCLUDE_TRACE
  69      - #include "trace/tracing.hpp"
       68 +#include "trace/tracing.hpp"
  70   69  #endif
  71   70  
  72   71  Dictionary*            SystemDictionary::_dictionary          = NULL;
  73   72  PlaceholderTable*      SystemDictionary::_placeholders        = NULL;
  74   73  Dictionary*            SystemDictionary::_shared_dictionary   = NULL;
  75   74  LoaderConstraintTable* SystemDictionary::_loader_constraints  = NULL;
  76   75  ResolutionErrorTable*  SystemDictionary::_resolution_errors   = NULL;
  77   76  SymbolPropertyTable*   SystemDictionary::_invoke_method_table = NULL;
  78   77  
  79   78  
↓ open down ↓ 2577 lines elided ↑ open up ↑
2657 2656      event.set_starttime(start_time);
2658 2657      event.set_loadedClass(k());
2659 2658      oop defining_class_loader = k->class_loader();
2660 2659      event.set_definingClassLoader(defining_class_loader !=  NULL ?
2661 2660                                      defining_class_loader->klass() : (Klass*)NULL);
2662 2661      oop class_loader = initiating_loader.is_null() ? (oop)NULL : initiating_loader();
2663 2662      event.set_initiatingClassLoader(class_loader != NULL ?
2664 2663                                        class_loader->klass() : (Klass*)NULL);
2665 2664      event.commit();
2666 2665    }
2667      -#endif /* INCLUDE_TRACE */
     2666 +#endif // INCLUDE_TRACE
2668 2667  }
2669 2668  
2670 2669  #ifndef PRODUCT
2671 2670  
2672 2671  // statistics code
2673 2672  class ClassStatistics: AllStatic {
2674 2673   private:
2675 2674    static int nclasses;        // number of classes
2676 2675    static int nmethods;        // number of methods
2677 2676    static int nmethoddata;     // number of methodData
↓ open down ↓ 176 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX