src/hotspot/share/classfile/classLoader.hpp

@@ -91,10 +91,11 @@
   public:
    bool is_jar_file() const { return true;  }
    const char* name() const { return _zip_name; }
    ClassPathZipEntry(jzfile* zip, const char* zip_name);
    virtual ~ClassPathZipEntry();
+   bool has_entry(JavaThread* current, const char* name);
    u1* open_entry(JavaThread* current, const char* name, jint* filesize, bool nul_terminate);
    ClassFileStream* open_stream(JavaThread* current, const char* name);
  };
  
  

@@ -146,10 +147,11 @@
    // Performance counters
    static PerfCounter* _perf_accumulated_time;
    static PerfCounter* _perf_classes_inited;
    static PerfCounter* _perf_class_init_time;
    static PerfCounter* _perf_class_init_selftime;
+   static PerfCounter* _perf_class_init_bytecodes_count;
    static PerfCounter* _perf_classes_verified;
    static PerfCounter* _perf_class_verify_time;
    static PerfCounter* _perf_class_verify_selftime;
    static PerfCounter* _perf_classes_linked;
    static PerfCounter* _perf_class_link_time;

@@ -162,19 +164,24 @@
    static PerfCounter* _perf_define_appclasses;
    static PerfCounter* _perf_define_appclass_time;
    static PerfCounter* _perf_define_appclass_selftime;
    static PerfCounter* _perf_app_classfile_bytes_read;
    static PerfCounter* _perf_sys_classfile_bytes_read;
+   static PerfCounter* _perf_preload_total_time;
+   static PerfCounter* _perf_preload_time;
+   static PerfCounter* _perf_prelink_time;
+   static PerfCounter* _perf_preinit_time;
+   static PerfCounter* _perf_preresolve_time;
    static PerfCounter* _perf_ik_link_methods_time;
    static PerfCounter* _perf_method_adapters_time;
    static PerfCounter* _perf_ik_link_methods_count;
    static PerfCounter* _perf_method_adapters_count;
  
-   static PerfCounter* _perf_resolve_indy_time;
-   static PerfCounter* _perf_resolve_invokehandle_time;
-   static PerfCounter* _perf_resolve_mh_time;
-   static PerfCounter* _perf_resolve_mt_time;
+   static PerfTickCounters* _perf_resolve_indy_time;
+   static PerfTickCounters* _perf_resolve_invokehandle_time;
+   static PerfTickCounters* _perf_resolve_mh_time;
+   static PerfTickCounters* _perf_resolve_mt_time;
  
    static PerfCounter* _perf_resolve_indy_count;
    static PerfCounter* _perf_resolve_invokehandle_count;
    static PerfCounter* _perf_resolve_mh_count;
    static PerfCounter* _perf_resolve_mt_count;

@@ -275,25 +282,32 @@
    static PerfCounter* perf_define_appclass_time()     { return _perf_define_appclass_time; }
    static PerfCounter* perf_define_appclass_selftime() { return _perf_define_appclass_selftime; }
    static PerfCounter* perf_app_classfile_bytes_read() { return _perf_app_classfile_bytes_read; }
    static PerfCounter* perf_sys_classfile_bytes_read() { return _perf_sys_classfile_bytes_read; }
  
+   static PerfCounter* perf_preload_total_time() { return _perf_preload_total_time; }
+   static PerfCounter* perf_preload_time() { return _perf_preload_time; }
+   static PerfCounter* perf_prelink_time() { return _perf_prelink_time; }
+   static PerfCounter* perf_preinit_time() { return _perf_preinit_time; }
+   static PerfCounter* perf_preresolve_time() { return _perf_preresolve_time; }
    static PerfCounter* perf_ik_link_methods_time() { return _perf_ik_link_methods_time; }
    static PerfCounter* perf_method_adapters_time() { return _perf_method_adapters_time; }
    static PerfCounter* perf_ik_link_methods_count() { return _perf_ik_link_methods_count; }
    static PerfCounter* perf_method_adapters_count() { return _perf_method_adapters_count; }
  
-   static PerfCounter* perf_resolve_invokedynamic_time() { return _perf_resolve_indy_time; }
-   static PerfCounter* perf_resolve_invokehandle_time() { return _perf_resolve_invokehandle_time; }
-   static PerfCounter* perf_resolve_method_handle_time() { return _perf_resolve_mh_time; }
-   static PerfCounter* perf_resolve_method_type_time() { return _perf_resolve_mt_time; }
+   static PerfTickCounters* perf_resolve_invokedynamic_time() { return _perf_resolve_indy_time; }
+   static PerfTickCounters* perf_resolve_invokehandle_time() { return _perf_resolve_invokehandle_time; }
+   static PerfTickCounters* perf_resolve_method_handle_time() { return _perf_resolve_mh_time; }
+   static PerfTickCounters* perf_resolve_method_type_time() { return _perf_resolve_mt_time; }
  
    static PerfCounter* perf_resolve_invokedynamic_count() { return _perf_resolve_indy_count; }
    static PerfCounter* perf_resolve_invokehandle_count() { return _perf_resolve_invokehandle_count; }
    static PerfCounter* perf_resolve_method_handle_count() { return _perf_resolve_mh_count; }
    static PerfCounter* perf_resolve_method_type_count() { return _perf_resolve_mt_count; }
  
+   static PerfCounter* perf_class_init_bytecodes_count() { return _perf_class_init_bytecodes_count; }
+ 
    static void print_counters(outputStream *st);
  
    // Record how many calls to Unsafe_DefineClass
    static PerfCounter* unsafe_defineClassCallCounter() {
      return _unsafe_defineClassCallCounter;

@@ -364,10 +378,11 @@
    static jlong class_init_count();
    static jlong class_init_time_ms();
    static jlong class_verify_time_ms();
    static jlong class_link_count();
    static jlong class_link_time_ms();
+   static jlong class_init_bytecodes_count();
  
    // adds a class path to the boot append entries
    static void add_to_boot_append_entries(ClassPathEntry* new_entry);
  
    // creates a class path zip entry (returns null if JAR file cannot be opened)