comparison src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @ 1579:e9ff18c4ace7

Merge
author jrose
date Wed, 02 Jun 2010 22:45:42 -0700
parents c18cbe5936b8 2d127394260e
children 215576b54709
comparison
equal deleted inserted replaced
1562:dfe27f03244a 1579:e9ff18c4ace7
3642 HeapWord* block = NULL; 3642 HeapWord* block = NULL;
3643 size_t free_words; 3643 size_t free_words;
3644 do { 3644 do {
3645 free_words = r->free()/HeapWordSize; 3645 free_words = r->free()/HeapWordSize;
3646 // If there's too little space, no one can allocate, so we're done. 3646 // If there's too little space, no one can allocate, so we're done.
3647 if (free_words < (size_t)oopDesc::header_size()) return; 3647 if (free_words < CollectedHeap::min_fill_size()) return;
3648 // Otherwise, try to claim it. 3648 // Otherwise, try to claim it.
3649 block = r->par_allocate(free_words); 3649 block = r->par_allocate(free_words);
3650 } while (block == NULL); 3650 } while (block == NULL);
3651 fill_with_object(block, free_words); 3651 fill_with_object(block, free_words);
3652 } 3652 }