comparison src/share/vm/memory/binaryTreeDictionary.cpp @ 14422:2b8e28fdf503

Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents bdfbb1fb19ca
children 63a4eb8bcd23 ab36007d6358
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
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.
26 #include "utilities/macros.hpp" 26 #include "utilities/macros.hpp"
27 #include "gc_implementation/shared/allocationStats.hpp" 27 #include "gc_implementation/shared/allocationStats.hpp"
28 #include "memory/binaryTreeDictionary.hpp" 28 #include "memory/binaryTreeDictionary.hpp"
29 #include "memory/freeList.hpp" 29 #include "memory/freeList.hpp"
30 #include "memory/freeBlockDictionary.hpp" 30 #include "memory/freeBlockDictionary.hpp"
31 #include "memory/metablock.hpp"
32 #include "memory/metachunk.hpp" 31 #include "memory/metachunk.hpp"
33 #include "runtime/globals.hpp" 32 #include "runtime/globals.hpp"
34 #include "utilities/ostream.hpp" 33 #include "utilities/ostream.hpp"
35 #include "utilities/macros.hpp" 34 #include "utilities/macros.hpp"
35 #include "gc_implementation/shared/spaceDecorator.hpp"
36 #if INCLUDE_ALL_GCS 36 #if INCLUDE_ALL_GCS
37 #include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp" 37 #include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
38 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" 38 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
39 #include "gc_implementation/shared/spaceDecorator.hpp"
40 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp" 39 #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
41 #endif // INCLUDE_ALL_GCS 40 #endif // INCLUDE_ALL_GCS
42 41
43 //////////////////////////////////////////////////////////////////////////////// 42 ////////////////////////////////////////////////////////////////////////////////
44 // A binary tree based search structure for free blocks. 43 // A binary tree based search structure for free blocks.