Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp @ 18058:54bc75c144b0
Merge
author | asaha |
---|---|
date | Thu, 29 May 2014 13:14:25 -0700 |
parents | 78bbf4d43a14 |
children | 52b4284cb496 ce8f6bb717c9 |
comparison
equal
deleted
inserted
replaced
18055:1fa005fb28f5 | 18058:54bc75c144b0 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2002, 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. |
28 #include "gc_implementation/shared/adaptiveSizePolicy.hpp" | 28 #include "gc_implementation/shared/adaptiveSizePolicy.hpp" |
29 #include "memory/allocation.hpp" | 29 #include "memory/allocation.hpp" |
30 #include "memory/allocation.inline.hpp" | 30 #include "memory/allocation.inline.hpp" |
31 #include "runtime/mutex.hpp" | 31 #include "runtime/mutex.hpp" |
32 #include "runtime/mutexLocker.hpp" | 32 #include "runtime/mutexLocker.hpp" |
33 | |
34 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
33 | 35 |
34 // | 36 // |
35 // GCTask | 37 // GCTask |
36 // | 38 // |
37 | 39 |