Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 4ca6dc0799b6 78bbf4d43a14 |
children | 7848fc12602b |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2005, 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. |
32 #include "memory/gcLocker.inline.hpp" | 32 #include "memory/gcLocker.inline.hpp" |
33 #include "runtime/interfaceSupport.hpp" | 33 #include "runtime/interfaceSupport.hpp" |
34 #include "runtime/os.hpp" | 34 #include "runtime/os.hpp" |
35 #include "utilities/dtrace.hpp" | 35 #include "utilities/dtrace.hpp" |
36 | 36 |
37 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
37 | 38 |
38 #ifndef USDT2 | 39 #ifndef USDT2 |
39 HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__begin); | 40 HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__begin); |
40 HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__end); | 41 HS_DTRACE_PROBE_DECL(hs_private, cms__initmark__end); |
41 | 42 |