From 51569de63dad05b9c83babb2d726065b102cf2b4 Mon Sep 17 00:00:00 2001
From: DKRZ-Xingran <wang@dkrz.de>
Date: Tue, 20 Sep 2022 09:12:43 +0200
Subject: [PATCH] differentiate model/test run
---
src/pio_interface.c | 2 --
src/pio_server.c | 10 ++--------
src/sct_timer_helper.h | 2 --
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/pio_interface.c b/src/pio_interface.c
index 7e0f7fe1f..8d0e53b84 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 fae999390..417a65fa0 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 a8301348d..c48a7dfbe 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;
--
GitLab