diff --git a/src/engine.c b/src/engine.c index 49c42d03de722b3eeefa87b0d4a2fe95bd34bb6a..fac88b6a0dd647821954569fe6bbe4e96fbe3987 100644 --- a/src/engine.c +++ b/src/engine.c @@ -4505,7 +4505,7 @@ void engine_prepare(struct engine *e) { /* Unskip active tasks and check for rebuild */ if (!e->forcerebuild && !e->forcerepart && !e->restarting) engine_unskip(e); - const ticks tic2 = getticks(); + const ticks tic3 = getticks(); #ifdef WITH_MPI MPI_Allreduce(MPI_IN_PLACE, &e->forcerebuild, 1, MPI_INT, MPI_MAX, @@ -4514,7 +4514,7 @@ void engine_prepare(struct engine *e) { if (e->verbose) message("Communicating rebuild flag took %.3f %s.", - clocks_from_ticks(getticks() - tic2), clocks_getunit()); + clocks_from_ticks(getticks() - tic3), clocks_getunit()); /* Do we need repartitioning ? */ if (e->forcerepart) { diff --git a/src/runner_doiact_stars.h b/src/runner_doiact_stars.h index 7941fdc926e83e5a1806afa70fde9ad7e6c4a502..e8e165056aee1dea6afe78e5c87c45555c5499cb 100644 --- a/src/runner_doiact_stars.h +++ b/src/runner_doiact_stars.h @@ -242,7 +242,7 @@ void runner_dopair_subset_stars_density(struct runner *r, } /* loop over the parts in cj. */ } /* loop over the parts in ci. */ - TIMER_TOC(timer_dopair_subset_naive); + TIMER_TOC(timer_dopair_subset_stars_density); } /** @@ -943,7 +943,7 @@ void runner_dosub_subset_stars_density(struct runner *r, struct cell *ci, } /* otherwise, pair interaction. */ - if (gettimer) TIMER_TOC(timer_dosub_subset); + if (gettimer) TIMER_TOC(timer_dosub_subset_stars_density); } /** @@ -1368,7 +1368,7 @@ void runner_dosub_pair_stars_density(struct runner *r, struct cell *ci, runner_dopair_branch_stars_density(r, ci, cj); } - if (gettimer) TIMER_TOC(TIMER_DOSUB_PAIR); + if (gettimer) TIMER_TOC(timer_dosub_pair_stars_density); } /** diff --git a/src/timers.c b/src/timers.c index 51d0e5f6dc4fd9e4e0567592750b8de45ecda06b..0a07a3b24da3e90e3be87f8dac06160b7edb03fe 100644 --- a/src/timers.c +++ b/src/timers.c @@ -93,6 +93,8 @@ const char* timers_names[timer_count] = { "dopair_subset_stars_density", "dosubpair_stars_density", "dosub_self_stars_density", + "dosub_pair_stars_density", + "dosub_subset_stars_density", }; /* File to store the timers */ diff --git a/src/timers.h b/src/timers.h index aba6ae33e3b8268c088694863967b96851715153..4a619d1291bcef13ca4000479eb09e83356893c6 100644 --- a/src/timers.h +++ b/src/timers.h @@ -89,11 +89,13 @@ enum { timer_step, timer_doself_stars_density, timer_dopair_stars_density, - timer_dostars_ghost, + timer_do_stars_ghost, timer_doself_subset_stars_density, timer_dopair_subset_stars_density, timer_dosubpair_stars_density, timer_dosub_self_stars_density, + timer_dosub_pair_stars_density, + timer_dosub_subset_stars_density, timer_count, };