Mercurial > hg > graal-compiler

comparison src/share/vm/gc_implementation/parNew/parNewGeneration.cpp @ 18041:52b4284cb496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6 8e20ef014b08
children 7848fc12602b
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
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.
52 #include "runtime/java.hpp" 52 #include "runtime/java.hpp"
53 #include "runtime/thread.hpp" 53 #include "runtime/thread.hpp"
54 #include "utilities/copy.hpp" 54 #include "utilities/copy.hpp"
55 #include "utilities/globalDefinitions.hpp" 55 #include "utilities/globalDefinitions.hpp"
56 #include "utilities/workgroup.hpp" 56 #include "utilities/workgroup.hpp"
57
58 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
57 59
58 #ifdef _MSC_VER 60 #ifdef _MSC_VER
59 #pragma warning( push ) 61 #pragma warning( push )
60 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list 62 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list
61 #endif 63 #endif
1634 ParallelRefProcEnabled && (ParallelGCThreads > 1), // mt processing 1636 ParallelRefProcEnabled && (ParallelGCThreads > 1), // mt processing
1635 (int) ParallelGCThreads, // mt processing degree 1637 (int) ParallelGCThreads, // mt processing degree
1636 refs_discovery_is_mt(), // mt discovery 1638 refs_discovery_is_mt(), // mt discovery
1637 (int) ParallelGCThreads, // mt discovery degree 1639 (int) ParallelGCThreads, // mt discovery degree
1638 refs_discovery_is_atomic(), // atomic_discovery 1640 refs_discovery_is_atomic(), // atomic_discovery
1639 NULL, // is_alive_non_header 1641 NULL); // is_alive_non_header
1640 false); // write barrier for next field updates
1641 } 1642 }
1642 } 1643 }
1643 1644
1644 const char* ParNewGeneration::name() const { 1645 const char* ParNewGeneration::name() const {
1645 return "par new generation"; 1646 return "par new generation";