Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 89152779163c 78bbf4d43a14 |
children | 7848fc12602b |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2012, 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. |
120 #endif | 120 #endif |
121 } | 121 } |
122 | 122 |
123 template <class Chunk> | 123 template <class Chunk> |
124 void AdaptiveFreeList<Chunk>::return_chunk_at_tail(Chunk* chunk) { | 124 void AdaptiveFreeList<Chunk>::return_chunk_at_tail(Chunk* chunk) { |
125 return_chunk_at_tail(chunk, true); | 125 AdaptiveFreeList<Chunk>::return_chunk_at_tail(chunk, true); |
126 } | 126 } |
127 | 127 |
128 template <class Chunk> | 128 template <class Chunk> |
129 void AdaptiveFreeList<Chunk>::return_chunk_at_tail(Chunk* chunk, bool record_return) { | 129 void AdaptiveFreeList<Chunk>::return_chunk_at_tail(Chunk* chunk, bool record_return) { |
130 FreeList<Chunk>::return_chunk_at_tail(chunk, record_return); | 130 FreeList<Chunk>::return_chunk_at_tail(chunk, record_return); |
155 " + split_births(" SIZE_FORMAT ")" | 155 " + split_births(" SIZE_FORMAT ")" |
156 " + coal_births(" SIZE_FORMAT ") + 1 >= " | 156 " + coal_births(" SIZE_FORMAT ") + 1 >= " |
157 " split_deaths(" SIZE_FORMAT ")" | 157 " split_deaths(" SIZE_FORMAT ")" |
158 " coal_deaths(" SIZE_FORMAT ")" | 158 " coal_deaths(" SIZE_FORMAT ")" |
159 " + count(" SSIZE_FORMAT ")", | 159 " + count(" SSIZE_FORMAT ")", |
160 this, size(), _allocation_stats.prev_sweep(), _allocation_stats.split_births(), | 160 p2i(this), size(), _allocation_stats.prev_sweep(), _allocation_stats.split_births(), |
161 _allocation_stats.split_births(), _allocation_stats.split_deaths(), | 161 _allocation_stats.split_births(), _allocation_stats.split_deaths(), |
162 _allocation_stats.coal_deaths(), count())); | 162 _allocation_stats.coal_deaths(), count())); |
163 } | 163 } |
164 #endif | 164 #endif |
165 | 165 |