8056043: Heap does not shrink within the heap after JDK-8038423

Enable shrinking within the heap by removing some code added for JDK-8054818. Enable the test case that checks that again too.

Reviewed-by: jwilhelm, jmasa
This commit is contained in:
Thomas Schatzl 2014-08-27 08:59:05 +02:00
parent f789d43b8e
commit b89a9d94b5
2 changed files with 1 additions and 6 deletions

View File

@ -351,10 +351,6 @@ uint HeapRegionManager::shrink_by(uint num_regions_to_remove) {
while ((removed < num_regions_to_remove) &&
(num_last_found = find_empty_from_idx_reverse(cur, &idx_last_found)) > 0) {
// Only allow uncommit from the end of the heap.
if ((idx_last_found + num_last_found) != _allocated_heapregions_length) {
return 0;
}
uint to_remove = MIN2(num_regions_to_remove - removed, num_last_found);
uncommit_regions(idx_last_found + num_last_found - to_remove, to_remove);

View File

@ -22,9 +22,8 @@
*/
/**
* @ignore 8041506, 8041946, 8042051
* @test TestHumongousShrinkHeap
* @bug 8036025
* @bug 8036025 8056043
* @summary Verify that heap shrinks after GC in the presence of fragmentation due to humongous objects
* @library /testlibrary
* @run main/othervm -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=50 -XX:+UseG1GC -XX:G1HeapRegionSize=1M -verbose:gc TestHumongousShrinkHeap