--- old/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp 2015-05-13 13:54:42.810804869 +0200 +++ /dev/null 2015-03-18 17:10:38.111854831 +0100 @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2007, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP -#define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP - -#define VM_STRUCTS_CMS(nonstatic_field, \ - volatile_nonstatic_field, \ - static_field) \ - nonstatic_field(CompactibleFreeListSpace, _collector, CMSCollector*) \ - nonstatic_field(CompactibleFreeListSpace, _bt, BlockOffsetArrayNonContigSpace) \ - \ - nonstatic_field(CMSBitMap, _bmWordSize, size_t) \ - nonstatic_field(CMSBitMap, _shifter, const int) \ - nonstatic_field(CMSBitMap, _bm, BitMap) \ - nonstatic_field(CMSBitMap, _virtual_space, VirtualSpace) \ - nonstatic_field(CMSCollector, _markBitMap, CMSBitMap) \ - nonstatic_field(ConcurrentMarkSweepGeneration, _cmsSpace, CompactibleFreeListSpace*) \ - static_field(ConcurrentMarkSweepThread, _collector, CMSCollector*) \ - nonstatic_field(LinearAllocBlock, _word_size, size_t) \ - nonstatic_field(AFLBinaryTreeDictionary, _total_size, size_t) \ - nonstatic_field(CompactibleFreeListSpace, _dictionary, AFLBinaryTreeDictionary*) \ - nonstatic_field(CompactibleFreeListSpace, _indexedFreeList[0], AdaptiveFreeList) \ - nonstatic_field(CompactibleFreeListSpace, _smallLinearAllocBlock, LinearAllocBlock) - - -#define VM_TYPES_CMS(declare_type, \ - declare_toplevel_type) \ - \ - declare_type(ConcurrentMarkSweepGeneration,CardGeneration) \ - declare_type(CompactibleFreeListSpace, CompactibleSpace) \ - declare_type(ConcurrentMarkSweepThread, NamedThread) \ - declare_type(SurrogateLockerThread, JavaThread) \ - declare_toplevel_type(CMSCollector) \ - declare_toplevel_type(CMSBitMap) \ - declare_toplevel_type(FreeChunk) \ - declare_toplevel_type(Metablock) \ - declare_toplevel_type(ConcurrentMarkSweepThread*) \ - declare_toplevel_type(ConcurrentMarkSweepGeneration*) \ - declare_toplevel_type(SurrogateLockerThread*) \ - declare_toplevel_type(CompactibleFreeListSpace*) \ - declare_toplevel_type(CMSCollector*) \ - declare_toplevel_type(AFLBinaryTreeDictionary) \ - declare_toplevel_type(LinearAllocBlock) \ - declare_toplevel_type(FreeBlockDictionary) - -#define VM_INT_CONSTANTS_CMS(declare_constant) \ - declare_constant(Generation::ConcurrentMarkSweep) \ - -#endif // SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_VMSTRUCTS_CMS_HPP --- /dev/null 2015-03-18 17:10:38.111854831 +0100 +++ new/src/share/vm/gc/cms/vmStructs_cms.hpp 2015-05-13 13:54:42.544793831 +0200 @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2007, 2015, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP +#define SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP + +#define VM_STRUCTS_CMS(nonstatic_field, \ + volatile_nonstatic_field, \ + static_field) \ + nonstatic_field(CompactibleFreeListSpace, _collector, CMSCollector*) \ + nonstatic_field(CompactibleFreeListSpace, _bt, BlockOffsetArrayNonContigSpace) \ + \ + nonstatic_field(CMSBitMap, _bmWordSize, size_t) \ + nonstatic_field(CMSBitMap, _shifter, const int) \ + nonstatic_field(CMSBitMap, _bm, BitMap) \ + nonstatic_field(CMSBitMap, _virtual_space, VirtualSpace) \ + nonstatic_field(CMSCollector, _markBitMap, CMSBitMap) \ + nonstatic_field(ConcurrentMarkSweepGeneration, _cmsSpace, CompactibleFreeListSpace*) \ + static_field(ConcurrentMarkSweepThread, _collector, CMSCollector*) \ + nonstatic_field(LinearAllocBlock, _word_size, size_t) \ + nonstatic_field(AFLBinaryTreeDictionary, _total_size, size_t) \ + nonstatic_field(CompactibleFreeListSpace, _dictionary, AFLBinaryTreeDictionary*) \ + nonstatic_field(CompactibleFreeListSpace, _indexedFreeList[0], AdaptiveFreeList) \ + nonstatic_field(CompactibleFreeListSpace, _smallLinearAllocBlock, LinearAllocBlock) + + +#define VM_TYPES_CMS(declare_type, \ + declare_toplevel_type) \ + \ + declare_type(ConcurrentMarkSweepGeneration,CardGeneration) \ + declare_type(CompactibleFreeListSpace, CompactibleSpace) \ + declare_type(ConcurrentMarkSweepThread, NamedThread) \ + declare_type(SurrogateLockerThread, JavaThread) \ + declare_toplevel_type(CMSCollector) \ + declare_toplevel_type(CMSBitMap) \ + declare_toplevel_type(FreeChunk) \ + declare_toplevel_type(Metablock) \ + declare_toplevel_type(ConcurrentMarkSweepThread*) \ + declare_toplevel_type(ConcurrentMarkSweepGeneration*) \ + declare_toplevel_type(SurrogateLockerThread*) \ + declare_toplevel_type(CompactibleFreeListSpace*) \ + declare_toplevel_type(CMSCollector*) \ + declare_toplevel_type(AFLBinaryTreeDictionary) \ + declare_toplevel_type(LinearAllocBlock) \ + declare_toplevel_type(FreeBlockDictionary) + +#define VM_INT_CONSTANTS_CMS(declare_constant) \ + declare_constant(Generation::ConcurrentMarkSweep) \ + +#endif // SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP