Mercurial > hg > truffle

comparison src/share/vm/memory/generationSpec.cpp @ 8001:db9981fd3124

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS Summary: Rename INCLUDE_ALTERNATE_GCS to INCLUDE_ALL_GCS and replace SERIALGC with INCLUDE_ALL_GCS. Reviewed-by: coleenp, stefank
author jprovino
date Wed, 23 Jan 2013 13:02:39 -0500
parents da91efe96a93
children de6a9e811145
comparison
equal deleted inserted replaced
7619:46e60405583b 8001:db9981fd3124
28 #include "memory/filemap.hpp" 28 #include "memory/filemap.hpp"
29 #include "memory/genRemSet.hpp" 29 #include "memory/genRemSet.hpp"
30 #include "memory/generationSpec.hpp" 30 #include "memory/generationSpec.hpp"
31 #include "memory/tenuredGeneration.hpp" 31 #include "memory/tenuredGeneration.hpp"
32 #include "runtime/java.hpp" 32 #include "runtime/java.hpp"
33 #ifndef SERIALGC 33 #include "utilities/macros.hpp"
34 #if INCLUDE_ALL_GCS
34 #include "gc_implementation/parNew/asParNewGeneration.hpp" 35 #include "gc_implementation/parNew/asParNewGeneration.hpp"
35 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp" 36 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp"
36 #include "gc_implementation/parNew/parNewGeneration.hpp" 37 #include "gc_implementation/parNew/parNewGeneration.hpp"
37 #endif 38 #endif // INCLUDE_ALL_GCS
38 39
39 Generation* GenerationSpec::init(ReservedSpace rs, int level, 40 Generation* GenerationSpec::init(ReservedSpace rs, int level,
40 GenRemSet* remset) { 41 GenRemSet* remset) {
41 switch (name()) { 42 switch (name()) {
42 case Generation::DefNew: 43 case Generation::DefNew:
43 return new DefNewGeneration(rs, init_size(), level); 44 return new DefNewGeneration(rs, init_size(), level);
44 45
45 case Generation::MarkSweepCompact: 46 case Generation::MarkSweepCompact:
46 return new TenuredGeneration(rs, init_size(), level, remset); 47 return new TenuredGeneration(rs, init_size(), level, remset);
47 48
48 #ifndef SERIALGC 49 #if INCLUDE_ALL_GCS
49 case Generation::ParNew: 50 case Generation::ParNew:
50 return new ParNewGeneration(rs, init_size(), level); 51 return new ParNewGeneration(rs, init_size(), level);
51 52
52 case Generation::ASParNew: 53 case Generation::ASParNew:
53 return new ASParNewGeneration(rs, 54 return new ASParNewGeneration(rs,
92 93
93 g->initialize_performance_counters(); 94 g->initialize_performance_counters();
94 95
95 return g; 96 return g;
96 } 97 }
97 #endif // SERIALGC 98 #endif // INCLUDE_ALL_GCS
98 99
99 default: 100 default:
100 guarantee(false, "unrecognized GenerationName"); 101 guarantee(false, "unrecognized GenerationName");
101 return NULL; 102 return NULL;
102 } 103 }