Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp @ 18009:f73af4455d7d
Merge
author | asaha |
---|---|
date | Thu, 29 May 2014 09:56:06 -0700 |
parents | 78bbf4d43a14 |
children | 52b4284cb496 0982ec23da03 |
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. |
52 #include "services/management.hpp" | 52 #include "services/management.hpp" |
53 #include "services/memoryService.hpp" | 53 #include "services/memoryService.hpp" |
54 #include "utilities/events.hpp" | 54 #include "utilities/events.hpp" |
55 #include "utilities/stack.inline.hpp" | 55 #include "utilities/stack.inline.hpp" |
56 | 56 |
57 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC | |
58 | |
57 elapsedTimer PSMarkSweep::_accumulated_time; | 59 elapsedTimer PSMarkSweep::_accumulated_time; |
58 jlong PSMarkSweep::_time_of_last_gc = 0; | 60 jlong PSMarkSweep::_time_of_last_gc = 0; |
59 CollectorCounters* PSMarkSweep::_counters = NULL; | 61 CollectorCounters* PSMarkSweep::_counters = NULL; |
60 | 62 |
61 void PSMarkSweep::initialize() { | 63 void PSMarkSweep::initialize() { |