Mercurial > hg > truffle
diff src/share/vm/memory/collectorPolicy.hpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | 40136aa2cdb1 |
children | 9b4d0569f2f4 |
line wrap: on
line diff
--- a/src/share/vm/memory/collectorPolicy.hpp Thu Oct 10 18:26:22 2013 +0200 +++ b/src/share/vm/memory/collectorPolicy.hpp Fri Oct 11 10:38:03 2013 +0200 @@ -98,6 +98,9 @@ {} public: + // Return maximum heap alignment that may be imposed by the policy + static size_t compute_max_alignment(); + void set_min_alignment(size_t align) { _min_alignment = align; } size_t min_alignment() { return _min_alignment; } void set_max_alignment(size_t align) { _max_alignment = align; } @@ -234,9 +237,6 @@ // Try to allocate space by expanding the heap. virtual HeapWord* expand_heap_and_allocate(size_t size, bool is_tlab); - // compute max heap alignment - size_t compute_max_alignment(); - // Scale the base_size by NewRation according to // result = base_size / (NewRatio + 1) // and align by min_alignment()