src/hotspot/share/memory/metaspace.hpp

rev 60811 : imported patch jep387-all.patch
rev 60812 : [mq]: diff1

*** 39,49 ****
  class outputStream;
  
  namespace metaspace {
    class MetaspaceArena;
    class MetaspaceSizesSnapshot;
!   struct clms_stats_t;
  }
  
  ////////////////// Metaspace ///////////////////////
  
  // Namespace for important central static functions
--- 39,49 ----
  class outputStream;
  
  namespace metaspace {
    class MetaspaceArena;
    class MetaspaceSizesSnapshot;
!   struct ClmsStats;
  }
  
  ////////////////// Metaspace ///////////////////////
  
  // Namespace for important central static functions
*** 135,151 ****
--- 135,157 ----
    static void purge();
  
    static void report_metadata_oome(ClassLoaderData* loader_data, size_t word_size,
                                     MetaspaceObj::Type type, Metaspace::MetadataType mdtype, TRAPS);
  
+   static const char* metadata_type_name(Metaspace::MetadataType mdtype);
+ 
    static void print_compressed_class_space(outputStream* st) NOT_LP64({});
  
    // Return TRUE only if UseCompressedClassPointers is True.
    static bool using_class_space() {
      return NOT_LP64(false) LP64_ONLY(UseCompressedClassPointers);
    }
  
+   static bool is_class_space_allocation(MetadataType mdType) {
+     return mdType == ClassType && using_class_space();
+   }
+ 
    static bool initialized();
  
  };
  
  // ClassLoaderMetaspace is an inbetween-object between a CLD and its MetaspaceArena(s).
*** 211,221 ****
    // Prematurely returns a metaspace allocation to the _block_freelists
    // because it is not needed anymore.
    void deallocate(MetaWord* ptr, size_t word_size, bool is_class);
  
    // Update statistics. This walks all in-use chunks.
!   void add_to_statistics(metaspace::clms_stats_t* out) const;
  
    DEBUG_ONLY(void verify() const;)
  
    // This only exists for JFR and jcmd VM.classloader_stats. We may want to
    //  change this. Capacity as a stat is of questionable use since it may
--- 217,227 ----
    // Prematurely returns a metaspace allocation to the _block_freelists
    // because it is not needed anymore.
    void deallocate(MetaWord* ptr, size_t word_size, bool is_class);
  
    // Update statistics. This walks all in-use chunks.
!   void add_to_statistics(metaspace::ClmsStats* out) const;
  
    DEBUG_ONLY(void verify() const;)
  
    // This only exists for JFR and jcmd VM.classloader_stats. We may want to
    //  change this. Capacity as a stat is of questionable use since it may
*** 334,343 ****
    // convenient, use print_basic_report() instead.
    static void print_report(outputStream* out, size_t scale = 0);
  
    static void print_on(outputStream * out);
  
!   DEBUG_ONLY(static void verify(bool slow);)
  
  };
  
  #endif // SHARE_MEMORY_METASPACE_HPP
--- 340,349 ----
    // convenient, use print_basic_report() instead.
    static void print_report(outputStream* out, size_t scale = 0);
  
    static void print_on(outputStream * out);
  
!   DEBUG_ONLY(static void verify();)
  
  };
  
  #endif // SHARE_MEMORY_METASPACE_HPP