comparison src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp @ 18058:54bc75c144b0

Merge
author asaha
date Thu, 29 May 2014 13:14:25 -0700
parents 78bbf4d43a14
children 8e20ef014b08
comparison
equal deleted inserted replaced
18055:1fa005fb28f5 18058:54bc75c144b0
1 /* 1 /*
2 * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
59 #include "utilities/events.hpp" 59 #include "utilities/events.hpp"
60 #include "utilities/stack.inline.hpp" 60 #include "utilities/stack.inline.hpp"
61 61
62 #include <math.h> 62 #include <math.h>
63 63
64 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
65
64 // All sizes are in HeapWords. 66 // All sizes are in HeapWords.
65 const size_t ParallelCompactData::Log2RegionSize = 16; // 64K words 67 const size_t ParallelCompactData::Log2RegionSize = 16; // 64K words
66 const size_t ParallelCompactData::RegionSize = (size_t)1 << Log2RegionSize; 68 const size_t ParallelCompactData::RegionSize = (size_t)1 << Log2RegionSize;
67 const size_t ParallelCompactData::RegionSizeBytes = 69 const size_t ParallelCompactData::RegionSizeBytes =
68 RegionSize << LogHeapWordSize; 70 RegionSize << LogHeapWordSize;
925 927
926 void fill(ParallelScavengeHeap* heap) { 928 void fill(ParallelScavengeHeap* heap) {
927 _heap_used = heap->used(); 929 _heap_used = heap->used();
928 _young_gen_used = heap->young_gen()->used_in_bytes(); 930 _young_gen_used = heap->young_gen()->used_in_bytes();
929 _old_gen_used = heap->old_gen()->used_in_bytes(); 931 _old_gen_used = heap->old_gen()->used_in_bytes();
930 _metadata_used = MetaspaceAux::allocated_used_bytes(); 932 _metadata_used = MetaspaceAux::used_bytes();
931 }; 933 };
932 934
933 size_t heap_used() const { return _heap_used; } 935 size_t heap_used() const { return _heap_used; }
934 size_t young_gen_used() const { return _young_gen_used; } 936 size_t young_gen_used() const { return _young_gen_used; }
935 size_t old_gen_used() const { return _old_gen_used; } 937 size_t old_gen_used() const { return _old_gen_used; }