1.1 --- a/src/share/vm/runtime/vmStructs.cpp Mon Feb 02 23:26:33 2015 -0500
1.2 +++ b/src/share/vm/runtime/vmStructs.cpp Mon Feb 17 09:51:37 2014 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -248,7 +248,6 @@
1.11 typedef Hashtable<Klass*, mtClass> KlassHashtable;
1.12 typedef HashtableEntry<Klass*, mtClass> KlassHashtableEntry;
1.13 typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable;
1.14 -typedef BinaryTreeDictionary<Metablock, FreeList<Metablock> > MetablockTreeDictionary;
1.15
1.16 //--------------------------------------------------------------------------------
1.17 // VM_STRUCTS
1.18 @@ -1290,11 +1289,8 @@
1.19 volatile_nonstatic_field(FreeChunk, _size, size_t) \
1.20 nonstatic_field(FreeChunk, _next, FreeChunk*) \
1.21 nonstatic_field(FreeChunk, _prev, FreeChunk*) \
1.22 - nonstatic_field(FreeList<FreeChunk>, _size, size_t) \
1.23 - nonstatic_field(FreeList<Metablock>, _size, size_t) \
1.24 - nonstatic_field(FreeList<FreeChunk>, _count, ssize_t) \
1.25 - nonstatic_field(FreeList<Metablock>, _count, ssize_t) \
1.26 - nonstatic_field(MetablockTreeDictionary, _total_size, size_t)
1.27 + nonstatic_field(AdaptiveFreeList<FreeChunk>, _size, size_t) \
1.28 + nonstatic_field(AdaptiveFreeList<FreeChunk>, _count, ssize_t)
1.29
1.30
1.31 //--------------------------------------------------------------------------------
1.32 @@ -2166,14 +2162,8 @@
1.33 \
1.34 /* freelist */ \
1.35 declare_toplevel_type(FreeChunk*) \
1.36 - declare_toplevel_type(Metablock*) \
1.37 - declare_toplevel_type(FreeBlockDictionary<FreeChunk>*) \
1.38 - declare_toplevel_type(FreeList<FreeChunk>*) \
1.39 - declare_toplevel_type(FreeList<FreeChunk>) \
1.40 - declare_toplevel_type(FreeBlockDictionary<Metablock>*) \
1.41 - declare_toplevel_type(FreeList<Metablock>*) \
1.42 - declare_toplevel_type(FreeList<Metablock>) \
1.43 - declare_type(MetablockTreeDictionary, FreeBlockDictionary<Metablock>)
1.44 + declare_toplevel_type(AdaptiveFreeList<FreeChunk>*) \
1.45 + declare_toplevel_type(AdaptiveFreeList<FreeChunk>)
1.46
1.47
1.48 //--------------------------------------------------------------------------------
