Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp	Fri Aug 31 16:39:35 2012 -0700
     1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp	Sat Sep 01 13:25:18 2012 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -54,27 +54,6 @@
    1.11    }
    1.12  }
    1.13  
    1.14 -VM_ParallelGCFailedPermanentAllocation::VM_ParallelGCFailedPermanentAllocation(size_t size,
    1.15 -  unsigned int gc_count, unsigned int full_gc_count) :
    1.16 -  VM_GC_Operation(gc_count, GCCause::_allocation_failure, full_gc_count, true /* full */),
    1.17 -  _size(size),
    1.18 -  _result(NULL)
    1.19 -{
    1.20 -}
    1.21 -
    1.22 -void VM_ParallelGCFailedPermanentAllocation::doit() {
    1.23 -  SvcGCMarker sgcm(SvcGCMarker::FULL);
    1.24 -
    1.25 -  ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
    1.26 -  assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "must be a ParallelScavengeHeap");
    1.27 -
    1.28 -  GCCauseSetter gccs(heap, _gc_cause);
    1.29 -  _result = heap->failed_permanent_mem_allocate(_size);
    1.30 -  if (_result == NULL && GC_locker::is_active_and_needs_gc()) {
    1.31 -    set_gc_locked();
    1.32 -  }
    1.33 -}
    1.34 -
    1.35  // Only used for System.gc() calls
    1.36  VM_ParallelGCSystemGC::VM_ParallelGCSystemGC(unsigned int gc_count,
    1.37                                               unsigned int full_gc_count,
    1.38 @@ -96,6 +75,6 @@
    1.39      // If (and only if) the scavenge fails, this will invoke a full gc.
    1.40      heap->invoke_scavenge();
    1.41    } else {
    1.42 -    heap->invoke_full_gc(false);
    1.43 +    heap->do_full_collection(false);
    1.44    }
    1.45  }