Skip to content

Commit

Permalink
timing (#46197)
Browse files Browse the repository at this point in the history
Co-authored-by: Diogo Netto <dcn@Diogos-MacBook-Air.local>
Co-authored-by: Jameson Nash <vtjnash@gmail.com>
  • Loading branch information
3 people authored Feb 5, 2023
1 parent 51e3bc3 commit 4e5360c
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions src/gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2850,16 +2850,6 @@ static int _jl_gc_collect(jl_ptls_t ptls, jl_gc_collection_t collection)
gc_cblist_root_scanner, (collection));
}
gc_mark_loop(ptls);
gc_num.since_sweep += gc_num.allocd;
JL_PROBE_GC_MARK_END(scanned_bytes, perm_scanned_bytes);
gc_settime_premark_end();
gc_time_mark_pause(gc_start_time, scanned_bytes, perm_scanned_bytes);
uint64_t end_mark_time = jl_hrtime();
uint64_t mark_time = end_mark_time - start_mark_time;
gc_num.mark_time = mark_time;
gc_num.total_mark_time += mark_time;
int64_t actual_allocd = gc_num.since_sweep;
// marking is over

// 4. check for objects to finalize
clear_weak_refs();
Expand Down Expand Up @@ -2897,7 +2887,18 @@ static int _jl_gc_collect(jl_ptls_t ptls, jl_gc_collection_t collection)
gc_mark_finlist(mq, &to_finalize, 0);
gc_mark_loop(ptls);
mark_reset_age = 0;

gc_num.since_sweep += gc_num.allocd;
JL_PROBE_GC_MARK_END(scanned_bytes, perm_scanned_bytes);
gc_settime_premark_end();
gc_time_mark_pause(gc_start_time, scanned_bytes, perm_scanned_bytes);
uint64_t end_mark_time = jl_hrtime();
uint64_t mark_time = end_mark_time - start_mark_time;
gc_num.mark_time = mark_time;
gc_num.total_mark_time += mark_time;
int64_t actual_allocd = gc_num.since_sweep;
gc_settime_postmark_end();
// marking is over

// Flush everything in mark cache
gc_sync_all_caches_nolock(ptls);
Expand Down

3 comments on commit 4e5360c

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Executing the daily package evaluation, I will reply here when finished:

@nanosoldier runtests(isdaily = true)

@maleadt
Copy link
Member

@maleadt maleadt commented on 4e5360c Feb 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nanosoldier runtests(isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your job failed. Consult the server logs for more details (cc @maleadt).

Please sign in to comment.