Mercurial > hg > truffle

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
31 #include "memory/cardTableModRefBS.hpp" 31 #include "memory/cardTableModRefBS.hpp"
32 #include "memory/gcLocker.inline.hpp" 32 #include "memory/gcLocker.inline.hpp"
33 #include "oops/oop.inline.hpp" 33 #include "oops/oop.inline.hpp"
34 #include "runtime/java.hpp" 34 #include "runtime/java.hpp"
35 35
36 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
37
36 inline const char* PSOldGen::select_name() { 38 inline const char* PSOldGen::select_name() {
37 return UseParallelOldGC ? "ParOldGen" : "PSOldGen"; 39 return UseParallelOldGC ? "ParOldGen" : "PSOldGen";
38 } 40 }
39 41
40 PSOldGen::PSOldGen(ReservedSpace rs, size_t alignment, 42 PSOldGen::PSOldGen(ReservedSpace rs, size_t alignment,