src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp

rev 7474 : imported patch separateCardGeneration
rev 7476 : imported patch expand_for_gc_cause

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 1062,1071 ****
--- 1062,1073 ----
  
    // getter and initializer for _initiating_occupancy field.
    double initiating_occupancy() const { return _initiating_occupancy; }
    void   init_initiating_occupancy(intx io, uintx tr);
  
+   void expand_for_gc_cause(size_t bytes, size_t expand_bytes, CMSExpansionCause::Cause cause);
+ 
   public:
    ConcurrentMarkSweepGeneration(ReservedSpace rs, size_t initial_byte_size,
                                  int level, CardTableRS* ct,
                                  bool use_adaptive_freelists,
                                  FreeBlockDictionary<FreeChunk>::DictionaryChoice);
*** 1188,1199 ****
    void update_time_of_last_gc(jlong now) {
      collector()-> update_time_of_last_gc(now);
    }
  
    // Allocation failure
-   void expand(size_t bytes, size_t expand_bytes,
-     CMSExpansionCause::Cause cause);
    virtual bool expand(size_t bytes, size_t expand_bytes);
    void shrink(size_t bytes);
    void shrink_by(size_t bytes);
    HeapWord* expand_and_par_lab_allocate(CMSParGCThreadState* ps, size_t word_sz);
    bool expand_and_ensure_spooling_space(PromotionInfo* promo);
--- 1190,1199 ----