1.1 --- a/src/share/vm/services/memoryService.hpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/share/vm/services/memoryService.hpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2003, 2012, 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 @@ -40,15 +40,11 @@ 1.11 class DefNewGeneration; 1.12 class PSYoungGen; 1.13 class PSOldGen; 1.14 -class PSPermGen; 1.15 class CodeHeap; 1.16 class ContiguousSpace; 1.17 class CompactibleFreeListSpace; 1.18 -class PermanentGenerationSpec; 1.19 class GenCollectedHeap; 1.20 class ParallelScavengeHeap; 1.21 -class CompactingPermGenGen; 1.22 -class CMSPermGenGen; 1.23 class G1CollectedHeap; 1.24 1.25 // VM Monitoring and Management Support 1.26 @@ -85,26 +81,18 @@ 1.27 add_generation_memory_pool(gen, major_mgr, NULL); 1.28 } 1.29 1.30 - static void add_compact_perm_gen_memory_pool(CompactingPermGenGen* perm_gen, 1.31 - MemoryManager* mgr); 1.32 - static void add_cms_perm_gen_memory_pool(CMSPermGenGen* perm_gen, 1.33 - MemoryManager* mgr); 1.34 1.35 static void add_psYoung_memory_pool(PSYoungGen* gen, 1.36 MemoryManager* major_mgr, 1.37 MemoryManager* minor_mgr); 1.38 static void add_psOld_memory_pool(PSOldGen* gen, 1.39 MemoryManager* mgr); 1.40 - static void add_psPerm_memory_pool(PSPermGen* perm, 1.41 - MemoryManager* mgr); 1.42 1.43 static void add_g1YoungGen_memory_pool(G1CollectedHeap* g1h, 1.44 MemoryManager* major_mgr, 1.45 MemoryManager* minor_mgr); 1.46 static void add_g1OldGen_memory_pool(G1CollectedHeap* g1h, 1.47 MemoryManager* mgr); 1.48 - static void add_g1PermGen_memory_pool(G1CollectedHeap* g1h, 1.49 - MemoryManager* mgr); 1.50 1.51 static MemoryPool* add_space(ContiguousSpace* space, 1.52 const char* name,