Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/vmStructs.cpp @ 22839:490b4cb2c0b5
8033440: jmap reports unexpected used/free size of concurrent mark-sweep generation
Summary: SA used the wrong type for the indexedFreeList in CompactibleFreeListSpace.
Reviewed-by: coleenp, dsamersoff
| author | sjohanss |
|---|---|
| date | Mon, 17 Feb 2014 09:51:37 +0100 |
| parents | c2844108a708 |
| children | f9d003ea9023 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vmStructs.cpp Mon Feb 02 23:26:33 2015 -0500 +++ b/src/share/vm/runtime/vmStructs.cpp Mon Feb 17 09:51:37 2014 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -248,7 +248,6 @@ typedef Hashtable<Klass*, mtClass> KlassHashtable; typedef HashtableEntry<Klass*, mtClass> KlassHashtableEntry; typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable; -typedef BinaryTreeDictionary<Metablock, FreeList<Metablock> > MetablockTreeDictionary; //-------------------------------------------------------------------------------- // VM_STRUCTS @@ -1290,11 +1289,8 @@ volatile_nonstatic_field(FreeChunk, _size, size_t) \ nonstatic_field(FreeChunk, _next, FreeChunk*) \ nonstatic_field(FreeChunk, _prev, FreeChunk*) \ - nonstatic_field(FreeList<FreeChunk>, _size, size_t) \ - nonstatic_field(FreeList<Metablock>, _size, size_t) \ - nonstatic_field(FreeList<FreeChunk>, _count, ssize_t) \ - nonstatic_field(FreeList<Metablock>, _count, ssize_t) \ - nonstatic_field(MetablockTreeDictionary, _total_size, size_t) + nonstatic_field(AdaptiveFreeList<FreeChunk>, _size, size_t) \ + nonstatic_field(AdaptiveFreeList<FreeChunk>, _count, ssize_t) //-------------------------------------------------------------------------------- @@ -2166,14 +2162,8 @@ \ /* freelist */ \ declare_toplevel_type(FreeChunk*) \ - declare_toplevel_type(Metablock*) \ - declare_toplevel_type(FreeBlockDictionary<FreeChunk>*) \ - declare_toplevel_type(FreeList<FreeChunk>*) \ - declare_toplevel_type(FreeList<FreeChunk>) \ - declare_toplevel_type(FreeBlockDictionary<Metablock>*) \ - declare_toplevel_type(FreeList<Metablock>*) \ - declare_toplevel_type(FreeList<Metablock>) \ - declare_type(MetablockTreeDictionary, FreeBlockDictionary<Metablock>) + declare_toplevel_type(AdaptiveFreeList<FreeChunk>*) \ + declare_toplevel_type(AdaptiveFreeList<FreeChunk>) //--------------------------------------------------------------------------------