comparison src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents 63a4eb8bcd23
children 89152779163c
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
1 /* 1 /*
2 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2003, 2012, 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.
116 return virtual_spaces()->reserved_space().size(); 116 return virtual_spaces()->reserved_space().size();
117 } 117 }
118 118
119 119
120 // Make checks on the current sizes of the generations and 120 // Make checks on the current sizes of the generations and
121 // the constraints on the sizes of the generations. Push 121 // the contraints on the sizes of the generations. Push
122 // up the boundary within the constraints. A partial 122 // up the boundary within the contraints. A partial
123 // push can occur. 123 // push can occur.
124 void AdjoiningGenerations::request_old_gen_expansion(size_t expand_in_bytes) { 124 void AdjoiningGenerations::request_old_gen_expansion(size_t expand_in_bytes) {
125 assert(UseAdaptiveSizePolicy && UseAdaptiveGCBoundary, "runtime check"); 125 assert(UseAdaptiveSizePolicy && UseAdaptiveGCBoundary, "runtime check");
126 126
127 assert_lock_strong(ExpandHeap_lock); 127 assert_lock_strong(ExpandHeap_lock);