Skip to content

Commit ab9535b

Browse files
committed
Removed out-dated calls to opal_progress_event_users_*() from init/finalize.
Since the event library has its own thread, trying reduce latency doesn't make much sense anymore if there's no consumers in this case. Signed-off-by: Austen Lauria <awlauria@us.ibm.com>
1 parent 4a55783 commit ab9535b

File tree

3 files changed

+0
-24
lines changed

3 files changed

+0
-24
lines changed

ompi/dpm/dpm.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12171217
OPAL_LIST_DESTRUCT(&job_info);
12181218
OPAL_LIST_DESTRUCT(&app_info);
12191219
PMIX_APP_FREE(apps, scount);
1220-
opal_progress_event_users_decrement();
12211220
if (NULL != hostfiles) {
12221221
opal_argv_free(hostfiles);
12231222
}
@@ -1239,7 +1238,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12391238
OPAL_LIST_DESTRUCT(&job_info);
12401239
OPAL_LIST_DESTRUCT(&app_info);
12411240
PMIX_APP_FREE(apps, scount);
1242-
opal_progress_event_users_decrement();
12431241
if (NULL != hostfiles) {
12441242
opal_argv_free(hostfiles);
12451243
}
@@ -1257,7 +1255,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12571255
OPAL_LIST_DESTRUCT(&job_info);
12581256
OPAL_LIST_DESTRUCT(&app_info);
12591257
PMIX_APP_FREE(apps, scount);
1260-
opal_progress_event_users_decrement();
12611258
if (NULL != hostfiles) {
12621259
opal_argv_free(hostfiles);
12631260
}
@@ -1275,7 +1272,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12751272
OPAL_LIST_DESTRUCT(&job_info);
12761273
OPAL_LIST_DESTRUCT(&app_info);
12771274
PMIX_APP_FREE(apps, scount);
1278-
opal_progress_event_users_decrement();
12791275
if (NULL != hostfiles) {
12801276
opal_argv_free(hostfiles);
12811277
}
@@ -1291,7 +1287,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
12911287
OPAL_LIST_DESTRUCT(&job_info);
12921288
OPAL_LIST_DESTRUCT(&app_info);
12931289
PMIX_APP_FREE(apps, scount);
1294-
opal_progress_event_users_decrement();
12951290
if (NULL != hostfiles) {
12961291
opal_argv_free(hostfiles);
12971292
}
@@ -1307,7 +1302,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
13071302
OPAL_LIST_DESTRUCT(&job_info);
13081303
OPAL_LIST_DESTRUCT(&app_info);
13091304
PMIX_APP_FREE(apps, scount);
1310-
opal_progress_event_users_decrement();
13111305
if (NULL != hostfiles) {
13121306
opal_argv_free(hostfiles);
13131307
}
@@ -1327,7 +1321,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
13271321
OPAL_LIST_DESTRUCT(&job_info);
13281322
OPAL_LIST_DESTRUCT(&app_info);
13291323
PMIX_APP_FREE(apps, scount);
1330-
opal_progress_event_users_decrement();
13311324
if (NULL != hostfiles) {
13321325
opal_argv_free(hostfiles);
13331326
}
@@ -1364,7 +1357,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
13641357
OPAL_LIST_DESTRUCT(&job_info);
13651358
OPAL_LIST_DESTRUCT(&app_info);
13661359
PMIX_APP_FREE(apps, scount);
1367-
opal_progress_event_users_decrement();
13681360
return MPI_ERR_SPAWN;
13691361
}
13701362
}
@@ -1395,7 +1387,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
13951387
OPAL_LIST_DESTRUCT(&job_info);
13961388
OPAL_LIST_DESTRUCT(&app_info);
13971389
PMIX_APP_FREE(apps, scount);
1398-
opal_progress_event_users_decrement();
13991390
return MPI_ERR_SPAWN;
14001391
}
14011392
}
@@ -1551,7 +1542,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
15511542
if (OMPI_SUCCESS != (rc = opal_getcwd(cwd, OPAL_PATH_MAX))) {
15521543
OMPI_ERROR_LOG(rc);
15531544
PMIX_APP_FREE(apps, (size_t)count);
1554-
opal_progress_event_users_decrement();
15551545
if (NULL != hostfiles) {
15561546
opal_argv_free(hostfiles);
15571547
}
@@ -1608,7 +1598,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
16081598
PMIX_INFO_FREE(pinfo, ninfo);
16091599
}
16101600
PMIX_APP_FREE(apps, scount);
1611-
opal_progress_event_users_decrement();
16121601
if (NULL != hostfiles) {
16131602
opal_argv_free(hostfiles);
16141603
}
@@ -1633,7 +1622,6 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
16331622
PMIX_APP_FREE(apps, scount);
16341623

16351624
if (OPAL_SUCCESS != rc) {
1636-
opal_progress_event_users_decrement();
16371625
return MPI_ERR_SPAWN;
16381626
}
16391627

@@ -2130,7 +2118,6 @@ static int start_dvm(char **hostfiles, char **dash_host)
21302118
pret = PMIx_Init(NULL, &info, 1);
21312119
rc = opal_pmix_convert_status(pret);
21322120
if (OPAL_SUCCESS != rc) {
2133-
opal_progress_event_users_decrement();
21342121
return MPI_ERR_SPAWN;
21352122
}
21362123
/* decrement the PMIx init refcount */

ompi/runtime/ompi_mpi_finalize.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,6 @@ int ompi_mpi_finalize(void)
205205
opal_progress_set_event_flag(OPAL_EVLOOP_ONCE | OPAL_EVLOOP_NONBLOCK);
206206
#endif
207207

208-
/* Redo PRTE calling opal_progress_event_users_increment() during
209-
MPI lifetime, to get better latency when not using TCP */
210-
opal_progress_event_users_increment();
211-
212208
/* NOTE: MPI-2.1 requires that MPI_FINALIZE is "collective" across
213209
*all* connected processes. This only means that all processes
214210
have to call it. It does *not* mean that all connected

ompi/runtime/ompi_mpi_init.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,13 +1023,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
10231023
goto error;
10241024
}
10251025

1026-
/* Undo OPAL calling opal_progress_event_users_increment() during
1027-
opal_init, to get better latency when not using TCP. Do
1028-
this *after* dyn_init, as dyn init uses lots of RTE
1029-
communication and we don't want to hinder the performance of
1030-
that code. */
1031-
opal_progress_event_users_decrement();
1032-
10331026
/* see if yield_when_idle was specified - if so, use it */
10341027
opal_progress_set_yield_when_idle(ompi_mpi_yield_when_idle);
10351028

0 commit comments

Comments
 (0)