@@ -29966,7 +29966,7 @@ void gc_heap::mark_phase (int condemned_gen_number)
29966
29966
#endif //MULTIPLE_HEAPS
29967
29967
{
29968
29968
#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);
29970
29970
gc_time_info[time_plan] = last_mark_time;
29971
29971
#endif //FEATURE_EVENT_TRACE
29972
29972
@@ -33964,26 +33964,12 @@ void gc_heap::plan_phase (int condemned_gen_number)
33964
33964
if (gc_t_join.joined())
33965
33965
#endif //MULTIPLE_HEAPS
33966
33966
{
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
-
33975
33967
#ifdef MULTIPLE_HEAPS
33976
33968
for (int i = 0; i < n_heaps; i++)
33977
33969
{
33978
- #ifdef USE_REGIONS
33979
- g_heaps [i]->rearrange_uoh_segments();
33980
- #endif //USE_REGIONS
33981
33970
g_heaps [i]->rearrange_heap_segments (TRUE);
33982
33971
}
33983
33972
#else //MULTIPLE_HEAPS
33984
- #ifdef USE_REGIONS
33985
- rearrange_uoh_segments();
33986
- #endif //USE_REGIONS
33987
33973
rearrange_heap_segments (TRUE);
33988
33974
#endif //MULTIPLE_HEAPS
33989
33975
@@ -34018,7 +34004,7 @@ void gc_heap::plan_phase (int condemned_gen_number)
34018
34004
#endif //MULTIPLE_HEAPS
34019
34005
34020
34006
#ifdef FEATURE_EVENT_TRACE
34021
- if (informational_event_enabled_p && (condemned_gen_number < (max_generation -1)) )
34007
+ if (informational_event_enabled_p)
34022
34008
{
34023
34009
uint64_t current_time = GetHighPrecisionTimeStamp();
34024
34010
gc_time_info[time_compact] = current_time - gc_time_info[time_compact];
0 commit comments