src/hotspot/share/gc/parallel/psCompactionManager.cpp

*** 1,7 ***
  /*
!  * Copyright (c) 2005, 2019, 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) 2005, 2020, 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.

*** 50,12 ***
  ParMarkBitMap*       ParCompactionManager::_mark_bitmap = NULL;
  RegionTaskQueueSet*  ParCompactionManager::_region_array = NULL;
  GrowableArray<size_t >* ParCompactionManager::_shadow_region_array = NULL;
  Monitor*                ParCompactionManager::_shadow_region_monitor = NULL;
  
! ParCompactionManager::ParCompactionManager() :
-     _action(CopyAndUpdate) {
  
    ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
  
    _old_gen = heap->old_gen();
    _start_array = old_gen()->start_array();
--- 50,11 ---
  ParMarkBitMap*       ParCompactionManager::_mark_bitmap = NULL;
  RegionTaskQueueSet*  ParCompactionManager::_region_array = NULL;
  GrowableArray<size_t >* ParCompactionManager::_shadow_region_array = NULL;
  Monitor*                ParCompactionManager::_shadow_region_monitor = NULL;
  
! ParCompactionManager::ParCompactionManager() {
  
    ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
  
    _old_gen = heap->old_gen();
    _start_array = old_gen()->start_array();

*** 113,23 ***
    for (uint i=0; i<=parallel_gc_threads; i++) {
      _manager_array[i]->reset_bitmap_query_cache();
    }
  }
  
- bool ParCompactionManager::should_update() {
-   assert(action() != NotValid, "Action is not set");
-   return (action() == ParCompactionManager::Update) ||
-          (action() == ParCompactionManager::CopyAndUpdate) ||
-          (action() == ParCompactionManager::UpdateAndCopy);
- }
- 
- bool ParCompactionManager::should_copy() {
-   assert(action() != NotValid, "Action is not set");
-   return (action() == ParCompactionManager::Copy) ||
-          (action() == ParCompactionManager::CopyAndUpdate) ||
-          (action() == ParCompactionManager::UpdateAndCopy);
- }
  
  ParCompactionManager*
  ParCompactionManager::gc_thread_compaction_manager(uint index) {
    assert(index < ParallelGCThreads, "index out of range");
    assert(_manager_array != NULL, "Sanity");
--- 112,10 ---

*** 197,6 ***
    _shadow_region_array->push(shadow_region);
  }
  
  void ParCompactionManager::remove_all_shadow_regions() {
    _shadow_region_array->clear();
! }
--- 183,6 ---
    _shadow_region_array->push(shadow_region);
  }
  
  void ParCompactionManager::remove_all_shadow_regions() {
    _shadow_region_array->clear();
! }