Mercurial > hg > truffle
comparison src/share/vm/memory/binaryTreeDictionary.cpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | de88570fabfc |
children | bdfbb1fb19ca |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2001, 2013, 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. |
31 #include "memory/metablock.hpp" | 31 #include "memory/metablock.hpp" |
32 #include "memory/metachunk.hpp" | 32 #include "memory/metachunk.hpp" |
33 #include "runtime/globals.hpp" | 33 #include "runtime/globals.hpp" |
34 #include "utilities/ostream.hpp" | 34 #include "utilities/ostream.hpp" |
35 #include "utilities/macros.hpp" | 35 #include "utilities/macros.hpp" |
36 #include "gc_implementation/shared/spaceDecorator.hpp" | |
36 #if INCLUDE_ALL_GCS | 37 #if INCLUDE_ALL_GCS |
37 #include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp" | 38 #include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp" |
38 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" | 39 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" |
39 #include "gc_implementation/shared/spaceDecorator.hpp" | |
40 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" | 40 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" |
41 #endif // INCLUDE_ALL_GCS | 41 #endif // INCLUDE_ALL_GCS |
42 | 42 |
43 //////////////////////////////////////////////////////////////////////////////// | 43 //////////////////////////////////////////////////////////////////////////////// |
44 // A binary tree based search structure for free blocks. | 44 // A binary tree based search structure for free blocks. |