Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.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 78bbf4d43a14
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 "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() {
182 184
183 // Capture heap size before collection for printing. 185 // Capture heap size before collection for printing.
184 size_t prev_used = heap->used(); 186 size_t prev_used = heap->used();
185 187
186 // Capture metadata size before collection for sizing. 188 // Capture metadata size before collection for sizing.
187 size_t metadata_prev_used = MetaspaceAux::allocated_used_bytes(); 189 size_t metadata_prev_used = MetaspaceAux::used_bytes();
188 190
189 // For PrintGCDetails 191 // For PrintGCDetails
190 size_t old_gen_prev_used = old_gen->used_in_bytes(); 192 size_t old_gen_prev_used = old_gen->used_in_bytes();
191 size_t young_gen_prev_used = young_gen->used_in_bytes(); 193 size_t young_gen_prev_used = young_gen->used_in_bytes();
192 194