Merge pull request #10744 from hppritcha/additional_fixes_for_10592

sessions: improve error return code

Author: hppritcha

ompi/mpi/c/session_call_errhandler.c

@@ -45,8 +45,12 @@ int MPI_Session_call_errhandler(MPI_Session session, int errorcode)
 
   if (MPI_PARAM_CHECK) {
     OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-    if (NULL == session) {
-        return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
+    if (ompi_instance_invalid(session)) {
+        if (NULL != session) {
+            return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_SESSION, FUNC_NAME);
+        } else {
+            return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_SESSION, FUNC_NAME);
+        }
     }
   }
 

ompi/mpi/c/session_get_errhandler.c

@@ -51,7 +51,11 @@ int MPI_Session_get_errhandler(MPI_Session session, MPI_Errhandler *errhandler)
     if (MPI_PARAM_CHECK) {
       OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
       if (ompi_instance_invalid(session)) {
+        if (NULL != session) {
+            return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_SESSION, FUNC_NAME);
+        } else {
             return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_SESSION, FUNC_NAME);
+        }
       }
     }
 

ompi/mpi/c/session_get_info.c

@@ -37,8 +37,12 @@ int MPI_Session_get_info (MPI_Session session, MPI_Info *info_used)
 {
     if (MPI_PARAM_CHECK) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-        if (NULL == session || MPI_SESSION_NULL == session) {
-            return MPI_ERR_ARG;
+        if (ompi_instance_invalid(session)) {
+            if (NULL != session) {
+                return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_SESSION, FUNC_NAME);
+            } else {
+                return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_SESSION, FUNC_NAME);
+            }
         }
         if (NULL == info_used) {
             return OMPI_ERRHANDLER_INVOKE (session, MPI_ERR_INFO, FUNC_NAME);

ompi/mpi/c/session_set_info.c

@@ -37,10 +37,14 @@ int MPI_Session_set_info (MPI_Session session, MPI_Info info)
 {
     if (MPI_PARAM_CHECK) {
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
-        if (NULL == session || MPI_SESSION_NULL == session) {
-            return MPI_ERR_ARG;
-        }
+        if (ompi_instance_invalid(session)) {
+            if (NULL != session) {
+                return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_SESSION, FUNC_NAME);
+            } else {
+                return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_SESSION, FUNC_NAME);
+            }
 
+        }
         if (NULL == info || MPI_INFO_NULL == info || ompi_info_is_freed(info)) {
             return OMPI_ERRHANDLER_INVOKE (session, MPI_ERR_INFO, FUNC_NAME);
         }