comparison src/share/vm/gc_implementation/g1/vm_operations_g1.cpp @ 12116:1624a68007bd

Merge
author jmasa
date Tue, 27 Aug 2013 18:55:33 -0700
parents f7d3b4387a16
children 0982ec23da03
comparison
equal deleted inserted replaced
12111:21ffbaa691b5 12116:1624a68007bd
68 _should_retry_gc(false), 68 _should_retry_gc(false),
69 _old_marking_cycles_completed_before(0) { 69 _old_marking_cycles_completed_before(0) {
70 guarantee(target_pause_time_ms > 0.0, 70 guarantee(target_pause_time_ms > 0.0,
71 err_msg("target_pause_time_ms = %1.6lf should be positive", 71 err_msg("target_pause_time_ms = %1.6lf should be positive",
72 target_pause_time_ms)); 72 target_pause_time_ms));
73 guarantee(word_size == 0 || gc_cause == GCCause::_g1_inc_collection_pause,
74 "we can only request an allocation if the GC cause is for "
75 "an incremental GC pause");
76 _gc_cause = gc_cause; 73 _gc_cause = gc_cause;
77 } 74 }
78 75
79 bool VM_G1IncCollectionPause::doit_prologue() { 76 bool VM_G1IncCollectionPause::doit_prologue() {
80 bool res = VM_GC_Operation::doit_prologue(); 77 bool res = VM_GC_Operation::doit_prologue();