diff --git a/src/pio_interface.c b/src/pio_interface.c index 7e0f7fe1f45ab1109762d698d321b255cc2e7a6e..8d0e53b8402dac7bc715f512863e6dd875d40881 100644 --- a/src/pio_interface.c +++ b/src/pio_interface.c @@ -560,9 +560,7 @@ void new_context(const char *context_name, MPI_Comm comm) timer_ioTotal = sct_new_timer("IO servers total"); timer_getTimeStepData = sct_new_timer(" L getTimeStepData"); - timer_winStart = sct_new_timer(" L window start"); timer_mpi_get = sct_new_timer(" L MPI_Get"); - timer_winComplete = sct_new_timer(" L window complete"); for (int i = 0; i < TIMER_MAX_STEPS; ++i) { sprintf(readgetbuffers_str, " L read getbuffers[%02d]", i+1); timer_readgetbuffers_arr[i] = sct_new_timer(readgetbuffers_str); diff --git a/src/pio_server.c b/src/pio_server.c index fae999390d2000f99096413e9bba890a763ea554..417a65fa0d4b637313522c35efcb69fc0e95f239 100644 --- a/src/pio_server.c +++ b/src/pio_server.c @@ -1970,24 +1970,18 @@ getTimeStepData(int *streamActivity, const struct cdiPioConf *conf) for (size_t streamIdx = 0; streamIdx < openStreams.size; ++streamIdx) if (streamActivity[streamIdx]) { - sct_start(timer_winStart); clearModelWinBuffer(streamIdx); + sct_start(timer_mpi_get); xmpi(MPI_Win_start(clientGroup, 0, rxWin[streamIdx].getWin)); - sct_stop(timer_winStart); /* FIXME: this needs to use MPI_PACKED for portability */ for (size_t i = 0; i < (size_t)numClients_; ++i) - { - sct_start(timer_mpi_get); xmpi(MPI_Get(rxWin[streamIdx].clientBuf[i].mem, (int)rxWin[streamIdx].clientBuf[i].size, MPI_UNSIGNED_CHAR, clientRanks_[i], 0, (int)rxWin[streamIdx].clientBuf[i].size, MPI_UNSIGNED_CHAR, rxWin[streamIdx].getWin)); - sct_stop(timer_mpi_get); - } - sct_start(timer_winComplete); xmpi(MPI_Win_complete(rxWin[streamIdx].getWin)); - sct_stop(timer_winComplete); + sct_stop(timer_mpi_get); if (!conf->batchedRMA) { xdebug("%s", "not batchedRMA"); diff --git a/src/sct_timer_helper.h b/src/sct_timer_helper.h index a8301348db58bbbf647731943239feeacf3c66ca..c48a7dfbeb90503bfa36f51e7d22f7f68d804e06 100644 --- a/src/sct_timer_helper.h +++ b/src/sct_timer_helper.h @@ -16,9 +16,7 @@ #define TIMER_LOG EXTERN int timer_ioTotal; EXTERN int timer_getTimeStepData; -EXTERN int timer_winStart; EXTERN int timer_mpi_get; -EXTERN int timer_winComplete; EXTERN int timer_yaxt_exchange; EXTERN int timer_postwritebatch; EXTERN int timer_readgetbuffers;