src/share/vm/gc/g1/g1ConcurrentMark.cpp

rev 13100 : imported patch 8182169-arrayallocator-should-take-memflag-parameter

*** 142,160 ****
  bool G1CMMarkStack::resize(size_t new_capacity) {
    assert(is_empty(), "Only resize when stack is empty.");
    assert(new_capacity <= _max_chunk_capacity,
           "Trying to resize stack to " SIZE_FORMAT " chunks when the maximum is " SIZE_FORMAT, new_capacity, _max_chunk_capacity);
  
!   TaskQueueEntryChunk* new_base = MmapArrayAllocator<TaskQueueEntryChunk, mtGC>::allocate_or_null(new_capacity);
  
    if (new_base == NULL) {
      log_warning(gc)("Failed to reserve memory for new overflow mark stack with " SIZE_FORMAT " chunks and size " SIZE_FORMAT "B.", new_capacity, new_capacity * sizeof(TaskQueueEntryChunk));
      return false;
    }
    // Release old mapping.
    if (_base != NULL) {
!     MmapArrayAllocator<TaskQueueEntryChunk, mtGC>::free(_base, _chunk_capacity);
    }
  
    _base = new_base;
    _chunk_capacity = new_capacity;
    set_empty();
--- 142,160 ----
  bool G1CMMarkStack::resize(size_t new_capacity) {
    assert(is_empty(), "Only resize when stack is empty.");
    assert(new_capacity <= _max_chunk_capacity,
           "Trying to resize stack to " SIZE_FORMAT " chunks when the maximum is " SIZE_FORMAT, new_capacity, _max_chunk_capacity);
  
!   TaskQueueEntryChunk* new_base = MmapArrayAllocator<TaskQueueEntryChunk>::allocate_or_null(new_capacity, mtGC);
  
    if (new_base == NULL) {
      log_warning(gc)("Failed to reserve memory for new overflow mark stack with " SIZE_FORMAT " chunks and size " SIZE_FORMAT "B.", new_capacity, new_capacity * sizeof(TaskQueueEntryChunk));
      return false;
    }
    // Release old mapping.
    if (_base != NULL) {
!     MmapArrayAllocator<TaskQueueEntryChunk>::free(_base, _chunk_capacity);
    }
  
    _base = new_base;
    _chunk_capacity = new_capacity;
    set_empty();
*** 203,213 ****
    }
  }
  
  G1CMMarkStack::~G1CMMarkStack() {
    if (_base != NULL) {
!     MmapArrayAllocator<TaskQueueEntryChunk, mtGC>::free(_base, _chunk_capacity);
    }
  }
  
  void G1CMMarkStack::add_chunk_to_list(TaskQueueEntryChunk* volatile* list, TaskQueueEntryChunk* elem) {
    elem->next = *list;
--- 203,213 ----
    }
  }
  
  G1CMMarkStack::~G1CMMarkStack() {
    if (_base != NULL) {
!     MmapArrayAllocator<TaskQueueEntryChunk>::free(_base, _chunk_capacity);
    }
  }
  
  void G1CMMarkStack::add_chunk_to_list(TaskQueueEntryChunk* volatile* list, TaskQueueEntryChunk* elem) {
    elem->next = *list;