comparison src/share/vm/memory/genCollectedHeap.hpp @ 14422:2b8e28fdf503

Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents 40136aa2cdb1
children 46d7652b223c
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
1 /* 1 /*
2 * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2000, 2013, 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.
144 virtual CollectorPolicy* collector_policy() const { return (CollectorPolicy*) gen_policy(); } 144 virtual CollectorPolicy* collector_policy() const { return (CollectorPolicy*) gen_policy(); }
145 145
146 // Adaptive size policy 146 // Adaptive size policy
147 virtual AdaptiveSizePolicy* size_policy() { 147 virtual AdaptiveSizePolicy* size_policy() {
148 return gen_policy()->size_policy(); 148 return gen_policy()->size_policy();
149 }
150
151 // Return the (conservative) maximum heap alignment
152 static size_t conservative_max_heap_alignment() {
153 return Generation::GenGrain;
149 } 154 }
150 155
151 size_t capacity() const; 156 size_t capacity() const;
152 size_t used() const; 157 size_t used() const;
153 158