Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions src/coreclr/gc/gc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23670,6 +23670,16 @@ void gc_heap::garbage_collect (int n)
STRESS_HEAP_ARG(n)
);

if (settings.condemned_generation != max_generation)
{
// do more BGCs
if (((VolatileLoadWithoutBarrier (&settings.gc_index) % 5) == 0) && (!gc_heap::background_running_p ()))
{
settings.condemned_generation = max_generation;
should_do_blocking_collection = FALSE;
}
}

STRESS_LOG1(LF_GCROOTS|LF_GC|LF_GCALLOC, LL_INFO10,
"condemned generation num: %d\n", settings.condemned_generation);

Expand Down Expand Up @@ -36784,6 +36794,12 @@ void gc_heap::recover_bgc_settings()

void gc_heap::allow_fgc()
{
// lengthen the BGC CM phase
if (cm_in_progress)
{
GCToOSInterface::YieldThread (0);
}

assert (bgc_thread == GCToEEInterface::GetThread());
bool bToggleGC = false;

Expand Down Expand Up @@ -44352,14 +44368,15 @@ CObjectHeader* gc_heap::allocate_uoh_object (size_t jsize, uint32_t flags, int g
uint8_t* current_lowest_address = background_saved_lowest_address;
uint8_t* current_highest_address = background_saved_highest_address;

if ((result < current_highest_address) && (result >= current_lowest_address))
{
dprintf (3, ("Clearing mark bit at address %zx",
(size_t)(&mark_array [mark_word_of (result)])));
//if ((result < current_highest_address) && (result >= current_lowest_address))
//{
// dprintf (3, ("Clearing mark bit at address %zx",
// (size_t)(&mark_array [mark_word_of (result)])));

mark_array_clear_marked (result);
}
if (current_c_gc_state != c_gc_state_free)
// mark_array_clear_marked (result);
//}
//if (current_c_gc_state != c_gc_state_free)
if (current_c_gc_state == c_gc_state_planning)
{
dprintf (3, ("Concurrent allocation of a large object %zx",
(size_t)obj));
Expand Down