Skip to content

Commit d32ce3f

Browse files
authored
Merge pull request #10589 from hppritcha/fix_issue_10588
sessions: define mpi_err_session
2 parents 7b15c3d + ec63157 commit d32ce3f

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

docs/man-openmpi/man5/Open-MPI.5.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@ Standard error return classes for Open MPI:
390390
- 73
391391
- The variable or category name is invalid.
392392

393+
* - MPI_ERR_SESSION
394+
- 78
395+
- Invalid session
396+
393397
* - MPI_ERR_LASTCODE
394398
- 93
395399
- Last error code.

ompi/errhandler/errcode.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ static ompi_mpi_errcode_t ompi_err_proc_fail_stop;
125125
static ompi_mpi_errcode_t ompi_err_proc_fail_pending;
126126
static ompi_mpi_errcode_t ompi_err_revoked;
127127
#endif
128+
static ompi_mpi_errcode_t ompi_err_session;
128129

129130
static void ompi_mpi_errcode_construct(ompi_mpi_errcode_t* errcode);
130131
static void ompi_mpi_errcode_destruct(ompi_mpi_errcode_t* errcode);
@@ -241,6 +242,7 @@ int ompi_mpi_errcode_init (void)
241242
CONSTRUCT_ERRCODE( ompi_err_proc_fail_pending, MPI_ERR_PROC_FAILED_PENDING, "MPI_ERR_PROC_FAILED_PENDING: Process Failure during an MPI_ANY_SOURCE non-blocking receive, request is still active" );
242243
CONSTRUCT_ERRCODE( ompi_err_revoked, MPI_ERR_REVOKED, "MPI_ERR_REVOKED: Communication Object Revoked" );
243244
#endif
245+
CONSTRUCT_ERRCODE( ompi_err_session, MPI_ERR_SESSION, "MPI_ERR_SESSION: Invalid session handle" );
244246

245247
/* Per MPI-3 p353:27-32, MPI_LASTUSEDCODE must be >=
246248
MPI_ERR_LASTCODE. So just start it as == MPI_ERR_LASTCODE. */
@@ -356,7 +358,7 @@ int ompi_mpi_errcode_finalize (void)
356358
OBJ_DESTRUCT(&ompi_err_proc_fail_pending);
357359
OBJ_DESTRUCT(&ompi_err_revoked);
358360
#endif
359-
361+
OBJ_DESTRUCT(&ompi_err_session);
360362
OBJ_DESTRUCT(&ompi_mpi_errcodes);
361363
ompi_mpi_errcode_lastpredefined = 0;
362364
opal_mutex_unlock(&errcode_lock);

ompi/include/mpi.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,7 @@ enum {
751751
#define MPI_ERR_PROC_FAILED 75
752752
#define MPI_ERR_PROC_FAILED_PENDING 76
753753
#define MPI_ERR_REVOKED 77
754+
#define MPI_ERR_SESSION 78
754755

755756
/* Per MPI-3 p349 47, MPI_ERR_LASTCODE must be >= the last predefined
756757
MPI_ERR_<foo> code. Set the last code to allow some room for adding

ompi/include/mpif-values.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ sub write_file {
354354
$constants->{MPI_ERR_RMA_FLAVOR} = 70;
355355
$constants->{MPI_ERR_RMA_SHARED} = 71;
356356
$constants->{MPI_T_ERR_INVALID} = 72;
357+
$constants->{MPI_ERR_SESSION} = 78;
357358
$constants->{MPI_ERR_LASTCODE} = 92;
358359

359360
$constants->{MPI_IDENT} = 0;

0 commit comments

Comments
 (0)