Skip to content

Add missing MPI_T_PVAR_SESSION_NULL to mpi.h v1.10 #3138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2017
Merged

Add missing MPI_T_PVAR_SESSION_NULL to mpi.h v1.10 #3138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ompi/include/mpi.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,7 @@ enum {
*/
#define MPI_T_PVAR_ALL_HANDLES ((MPI_T_pvar_handle) -1)
#define MPI_T_PVAR_HANDLE_NULL ((MPI_T_pvar_handle) 0)
#define MPI_T_PVAR_SESSION_NULL ((MPI_T_pvar_session) 0)
#define MPI_T_CVAR_HANDLE_NULL ((MPI_T_cvar_handle) 0)

/* MPI-2 specifies that the name "MPI_TYPE_NULL_DELETE_FN" (and all
Expand Down
11 changes: 8 additions & 3 deletions ompi/mpi/tool/pvar_session_free.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,19 @@

int MPI_T_pvar_session_free(MPI_T_pvar_session *session)
{
int ret = MPI_SUCCESS;

if (!mpit_is_initialized ()) {
return MPI_T_ERR_NOT_INITIALIZED;
}

if (NULL != *session) {
/* Check that this is a valid session */
if (MPI_T_PVAR_SESSION_NULL == *session) {
ret = MPI_T_ERR_INVALID_SESSION;
} else {
OBJ_RELEASE(*session);
*session = NULL;
*session = MPI_T_PVAR_SESSION_NULL;
}

return MPI_SUCCESS;
return ret;
}