src/share/vm/gc_implementation/g1/heapRegionManager.cpp

rev 7885 : 8061715:gc/g1/TestShrinkAuxiliaryData15.java fails

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2015, 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.
*** 143,152 ****
--- 143,170 ----
      hr->initialize(mr);
      insert_into_free_list(at(i));
    }
  }
  
+ MemoryUsage HeapRegionManager::get_auxiliary_data_memory_usage() const {
+   size_t used_sz =
+     _prev_bitmap_mapper->committed_size() +
+     _next_bitmap_mapper->committed_size() +
+     _bot_mapper->committed_size() +
+     _cardtable_mapper->committed_size() +
+     _card_counts_mapper->committed_size();
+ 
+   size_t committed_sz =
+     _prev_bitmap_mapper->reserved_size() +
+     _next_bitmap_mapper->reserved_size() +
+     _bot_mapper->reserved_size() +
+     _cardtable_mapper->reserved_size() +
+     _card_counts_mapper->reserved_size();
+ 
+   return MemoryUsage(0, used_sz, committed_sz, committed_sz);
+ }
+ 
  uint HeapRegionManager::expand_by(uint num_regions) {
    return expand_at(0, num_regions);
  }
  
  uint HeapRegionManager::expand_at(uint start, uint num_regions) {