comparison src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp @ 18009:f73af4455d7d

Merge
author asaha
date Thu, 29 May 2014 09:56:06 -0700
parents 78bbf4d43a14
children 52b4284cb496
comparison
equal deleted inserted replaced
18008:da65bbf6f89e 18009:f73af4455d7d
1 /* 1 /*
2 * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2001, 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.
30 #include "gc_implementation/shared/gcUtil.hpp" 30 #include "gc_implementation/shared/gcUtil.hpp"
31 #include "gc_implementation/shared/mutableNUMASpace.hpp" 31 #include "gc_implementation/shared/mutableNUMASpace.hpp"
32 #include "gc_implementation/shared/spaceDecorator.hpp" 32 #include "gc_implementation/shared/spaceDecorator.hpp"
33 #include "oops/oop.inline.hpp" 33 #include "oops/oop.inline.hpp"
34 #include "runtime/java.hpp" 34 #include "runtime/java.hpp"
35
36 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
35 37
36 PSYoungGen::PSYoungGen(size_t initial_size, 38 PSYoungGen::PSYoungGen(size_t initial_size,
37 size_t min_size, 39 size_t min_size,
38 size_t max_size) : 40 size_t max_size) :
39 _init_gen_size(initial_size), 41 _init_gen_size(initial_size),