Mercurial > hg > graal-jvmci-8
comparison src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp @ 12840:aa6f2ea19d8f
Merge
author | jcoomes |
---|---|
date | Fri, 11 Oct 2013 08:27:21 -0700 |
parents | 9b4d0569f2f4 |
children | 24f32d09a0d7 |
comparison
equal
deleted
inserted
replaced
12829:c01f4910f5f5 | 12840:aa6f2ea19d8f |
---|---|
317 _collectionSetChooser = new CollectionSetChooser(); | 317 _collectionSetChooser = new CollectionSetChooser(); |
318 _young_gen_sizer = new G1YoungGenSizer(); // Must be after call to initialize_flags | 318 _young_gen_sizer = new G1YoungGenSizer(); // Must be after call to initialize_flags |
319 } | 319 } |
320 | 320 |
321 void G1CollectorPolicy::initialize_flags() { | 321 void G1CollectorPolicy::initialize_flags() { |
322 set_min_alignment(HeapRegion::GrainBytes); | 322 _min_alignment = HeapRegion::GrainBytes; |
323 size_t card_table_alignment = GenRemSet::max_alignment_constraint(rem_set_name()); | 323 size_t card_table_alignment = GenRemSet::max_alignment_constraint(rem_set_name()); |
324 size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size(); | 324 size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size(); |
325 set_max_alignment(MAX3(card_table_alignment, min_alignment(), page_size)); | 325 _max_alignment = MAX3(card_table_alignment, _min_alignment, page_size); |
326 if (SurvivorRatio < 1) { | 326 if (SurvivorRatio < 1) { |
327 vm_exit_during_initialization("Invalid survivor ratio specified"); | 327 vm_exit_during_initialization("Invalid survivor ratio specified"); |
328 } | 328 } |
329 CollectorPolicy::initialize_flags(); | 329 CollectorPolicy::initialize_flags(); |
330 } | 330 } |