Skip to content

Commit 264023e

Browse files
authored
Fix compact time computation (#100599)
1 parent e1bda8a commit 264023e

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

src/coreclr/gc/gc.cpp

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29966,7 +29966,7 @@ void gc_heap::mark_phase (int condemned_gen_number)
2996629966
#endif //MULTIPLE_HEAPS
2996729967
{
2996829968
#ifdef FEATURE_EVENT_TRACE
29969-
record_mark_time (gc_time_info[time_plan - 1], current_mark_time, last_mark_time);
29969+
record_mark_time (gc_time_info[time_mark_long_weak], current_mark_time, last_mark_time);
2997029970
gc_time_info[time_plan] = last_mark_time;
2997129971
#endif //FEATURE_EVENT_TRACE
2997229972

@@ -33964,26 +33964,12 @@ void gc_heap::plan_phase (int condemned_gen_number)
3396433964
if (gc_t_join.joined())
3396533965
#endif //MULTIPLE_HEAPS
3396633966
{
33967-
#ifdef FEATURE_EVENT_TRACE
33968-
if (informational_event_enabled_p)
33969-
{
33970-
uint64_t current_time = GetHighPrecisionTimeStamp();
33971-
gc_time_info[time_compact] = current_time - gc_time_info[time_compact];
33972-
}
33973-
#endif //FEATURE_EVENT_TRACE
33974-
3397533967
#ifdef MULTIPLE_HEAPS
3397633968
for (int i = 0; i < n_heaps; i++)
3397733969
{
33978-
#ifdef USE_REGIONS
33979-
g_heaps [i]->rearrange_uoh_segments();
33980-
#endif //USE_REGIONS
3398133970
g_heaps [i]->rearrange_heap_segments (TRUE);
3398233971
}
3398333972
#else //MULTIPLE_HEAPS
33984-
#ifdef USE_REGIONS
33985-
rearrange_uoh_segments();
33986-
#endif //USE_REGIONS
3398733973
rearrange_heap_segments (TRUE);
3398833974
#endif //MULTIPLE_HEAPS
3398933975

@@ -34018,7 +34004,7 @@ void gc_heap::plan_phase (int condemned_gen_number)
3401834004
#endif //MULTIPLE_HEAPS
3401934005

3402034006
#ifdef FEATURE_EVENT_TRACE
34021-
if (informational_event_enabled_p && (condemned_gen_number < (max_generation -1)))
34007+
if (informational_event_enabled_p)
3402234008
{
3402334009
uint64_t current_time = GetHighPrecisionTimeStamp();
3402434010
gc_time_info[time_compact] = current_time - gc_time_info[time_compact];

0 commit comments

Comments
 (0)