src/share/vm/gc_implementation/shared/vmGCOperations.hpp

rev 7215 : imported patch remove_levels
rev 7216 : imported patch cleanup

*** 184,201 ****
  
  // VM operation to invoke a collection of the heap as a
  // GenCollectedHeap heap.
  class VM_GenCollectFull: public VM_GC_Operation {
   private:
!   int _max_level;
   public:
    VM_GenCollectFull(unsigned int gc_count_before,
                      unsigned int full_gc_count_before,
                      GCCause::Cause gc_cause,
!                       int max_level)
      : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before, true /* full */),
!       _max_level(max_level) { }
    ~VM_GenCollectFull() {}
    virtual VMOp_Type type() const { return VMOp_GenCollectFull; }
    virtual void doit();
  };
  
--- 184,201 ----
  
  // VM operation to invoke a collection of the heap as a
  // GenCollectedHeap heap.
  class VM_GenCollectFull: public VM_GC_Operation {
   private:
!   Generation::Type _max_generation;
   public:
    VM_GenCollectFull(unsigned int gc_count_before,
                      unsigned int full_gc_count_before,
                      GCCause::Cause gc_cause,
!                     Generation::Type max_generation)
      : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before, true /* full */),
!       _max_generation(max_generation) { }
    ~VM_GenCollectFull() {}
    virtual VMOp_Type type() const { return VMOp_GenCollectFull; }
    virtual void doit();
  };
  
*** 205,215 ****
    size_t                   _size;     // size of object to be allocated
    Metaspace::MetadataType  _mdtype;
    ClassLoaderData*         _loader_data;
   public:
    VM_CollectForMetadataAllocation(ClassLoaderData* loader_data,
!                                   size_t size, Metaspace::MetadataType mdtype,
                                        unsigned int gc_count_before,
                                        unsigned int full_gc_count_before,
                                        GCCause::Cause gc_cause)
      : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before, true),
        _loader_data(loader_data), _size(size), _mdtype(mdtype), _result(NULL) {
--- 205,216 ----
    size_t                   _size;     // size of object to be allocated
    Metaspace::MetadataType  _mdtype;
    ClassLoaderData*         _loader_data;
   public:
    VM_CollectForMetadataAllocation(ClassLoaderData* loader_data,
!                                   size_t size,
!                                   Metaspace::MetadataType mdtype,
                                    unsigned int gc_count_before,
                                    unsigned int full_gc_count_before,
                                    GCCause::Cause gc_cause)
      : VM_GC_Operation(gc_count_before, gc_cause, full_gc_count_before, true),
        _loader_data(loader_data), _size(size), _mdtype(mdtype), _result(NULL) {